From: Junio C Hamano <junkio@cox.net>
Date: Sat, 11 Jun 2005 09:53:57 +0000 (-0700)
Subject: [PATCH] read-tree: loosen too strict index requirements
X-Git-Tag: v0.99~280
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/036d51cc557bcf919246ad30cb2ac7736bfc836b?ds=inline;hp=036d51cc557bcf919246ad30cb2ac7736bfc836b

[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>
---