From 795e730e71e8a068ce0cb0790512dab0f1922369 Mon Sep 17 00:00:00 2001
From: Avery Pennarun <apenwarr@gmail.com>
Date: Sun, 26 Apr 2009 17:44:18 -0400
Subject: [PATCH] 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.
---
 git-subtree.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-subtree.sh b/git-subtree.sh
index 90e22ad8b..e2e47f82a 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 $?
-- 
2.26.2