Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:34

Josef Weidendorfer [off-list ref] writes:
On Wednesday 26 July 2006 19:41, Johannes Schindelin wrote:
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help