From: Avery Pennarun <apenwarr@gmail.com>
Date: Sun, 26 Apr 2009 21:44:18 +0000 (-0400)
Subject: Simplify merges even more aggressively.
X-Git-Tag: v1.7.11-rc0~176^2~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=795e730e71e8a068ce0cb0790512dab0f1922369;p=thirdparty%2Fgit.git

Simplify merges even more aggressively.

If any one of the parents is the same as the current one, then clearly the
other parent branch isn't important, so throw it away entirely.

Can't remember why I didn't do this before, but if I rediscover it, it
definitely needs a unit test.
---

diff --git a/git-subtree.sh b/git-subtree.sh
index 90e22ad8be..e2e47f82ac 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -286,7 +286,7 @@ copy_or_skip()
 		fi
 	done
 	
-	if [ -n "$identical" -a -z "$nonidentical" ]; then
+	if [ -n "$identical" ]; then
 		echo $identical
 	else
 		copy_commit $rev $tree "$p" || exit $?