diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-12 03:55:20 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 03:40:19 (GMT) |
| commit | 2210100ac00b8a46f1d94c044391bfa50b25afa4 (patch) | |
| tree | 76aeba1897c592e1965533a2cb8771671bd747ed /rev-tree.c | |
| parent | a7fa68c5f942706fce5636b9136d1b229e089190 (diff) | |
| download | git-2210100ac00b8a46f1d94c044391bfa50b25afa4.zip git-2210100ac00b8a46f1d94c044391bfa50b25afa4.tar.gz git-2210100ac00b8a46f1d94c044391bfa50b25afa4.tar.bz2 | |
[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>
Diffstat (limited to 'rev-tree.c')
0 files changed, 0 insertions, 0 deletions