projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1349f87) | patch
Remove uncontested renamed files during merge.
authorShawn Pearce <spearce@spearce.org>
Wed, 13 Dec 2006 10:42:44 +0000 (05:42 -0500)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 17:13:21 +0000 (09:13 -0800)
commit8371234ecaaf6e14fe3f2082a855eff1bbd79ae9
treede648693fea04a54043b799bfbb552caf6dc173atree | snapshot
parent1349f8771310987dd07b679a512e46e1b17e2b8dcommit | diff
Remove uncontested renamed files during merge.

Prior to 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae we deleted a file
from the working directory during a merge if the file existed before
the merge started but was renamed by the branch being merged in.
This broke in 65ac6e as git-merge-recursive did not actually update
the working directory on an uncontested rename.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c diff | blob | history
t/t6023-merge-rename-nocruft.sh [new file with mode: 0755] blob
Git—the stupid content tracker