projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a7fa68c) | patch
[PATCH] Fix rename/copy when dealing with temporarily broken pairs.
authorJunio C Hamano <junkio@cox.net>
Sun, 12 Jun 2005 03:55:20 +0000 (20:55 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 13 Jun 2005 03:40:19 +0000 (20:40 -0700)
commit2210100ac00b8a46f1d94c044391bfa50b25afa4
tree76aeba1897c592e1965533a2cb8771671bd747edtree | snapshot
parenta7fa68c5f942706fce5636b9136d1b229e089190commit | diff
[PATCH] Fix rename/copy when dealing with temporarily broken pairs.

When rename/copy uses a file that was broken by diffcore-break
as the source, and the broken filepair gets merged back later,
the output was mislabeled as a rename.  In this case, the source
file ends up staying in the output, so we should label it as a
copy instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff.c diff | blob | history
diffcore-rename.c diff | blob | history
The core git plumbing