On Thu, Dec 15, 2011 at 12:39 PM, Gustaf Nilsson <[email protected]> wrote:
> Lol i think i spot a problem already!
>
> I duplicated (the latest) pyjamas dir to pyjamas_mod which i made my
> changes in, then used "git diff pyjamas pyjamas_mod > showcase.patch"
> to generate this file. now i see that it actually has the pyjamas_mod
> directory name in the patch file. is that a problem and how do i
> unproblematise it?

why duplicate anything?  git (or any VCS really) it used specifically
to avoid such behavior :-)

to correct (assuming `origin/master` is upstream [should be after a clone]):

# git checkout -b bug667 origin/master
# rm -rf library/pyjamas
# mv library/pyjamas_mod library/pyjamas
# git diff
^^^^^^ make sure it looks correct!
# git commit -am "bug667: blah blah blah, yada yada, so on and so forth"
# git diff origin/master > mypatch-bug667.patch

... did you copy `library/pyjamas`, or the *entire* pyjamas directory
after a clone?  the above applies to the former, but the latter would
follow a similar method.

-- 

C Anthony

Reply via email to