| commit | 036d51cc557bcf919246ad30cb2ac7736bfc836b | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 11 Jun 2005 09:53:57 +0000 (11 02:53 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 13 Jun 2005 03:40:20 +0000 (12 20:40 -0700) | ||
| tree | 0691823355c5aa9b395fab377e11582808d38687 | treesnapshot (tar.gz zip) |
| parent | 32192e6622d78347448cfc0572827d6e64e0de28 | commitdiff |
[PATCH] read-tree: loosen too strict index requirements
This patch teaches read-tree 3-way merge that, when only "the
other tree" changed a path, and if the index file already has
the same change, we are not in a situation that would clobber
the index and the work tree, and lets the merge succeed; this is
case #14ALT in t1000 test. It does not change the result of the
merge, but prevents it from failing when it does not have to.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This patch teaches read-tree 3-way merge that, when only "the
other tree" changed a path, and if the index file already has
the same change, we are not in a situation that would clobber
the index and the work tree, and lets the merge succeed; this is
case #14ALT in t1000 test. It does not change the result of the
merge, but prevents it from failing when it does not have to.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| read-tree.c | diffblobblamehistory | |
| t/t1000-read-tree-m-3way.sh | diffblobblamehistory |