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.
Avery Pennarun committed
Apr 26, 2009 at 17:44 UTC
795e730e71e8a068ce0cb0790512dab0f1922369
1 file changed
+1
-1
git-subtree.sh
+1
-1
@@ -286,7 +286,7 @@ copy_or_skip()
286
fi
287
done
288
289
- if [ -n "$identical" -a -z "$nonidentical" ]; then
289
+ if [ -n "$identical" ]; then
290
echo $identical
291
else
292
copy_commit $rev $tree "$p" || exit $?