Josef Weidendorfer <Josef.Weidendorfer@xxxxxx> writes: > On Wednesday 26 July 2006 19:41, Johannes Schindelin wrote: >> >> If dir2 already exists, git-mv should move dir1 _into_dir2/. >> Noticed by Jon Smirl. > > Thanks for adding this test. > BTW, the original PERL script passes it quite fine. > > I just looked at Jon's problem. Doesn't seem to be related to > git-mv or git at all, but more a cogito problem. > I have some cogito-0.18pre installed, and cg-patch is patching > the stuff all itself, not using git for this. Pasky? "git apply" seems to grok this just fine. > Doing the same with git, i.e. in a rep with existing dir/ > > mkdir new > git mv dir new > git diff --cached -M -C >patch > git reset --hard > git apply <patch > > However, "git status" shows the "new/" directory totally > untracked afterwards. Is this expected? Running "git apply --index <patch" I see the "renamed: " in there and zzz (or your "new") is tracked. - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html