Don't squash-merge if the old and new commits are the same.
Avery Pennarun committed
May 30, 2009 at 03:33 UTC
eb4fb91094cf5e20bf7570da3fadb50e444284bc
1 file changed
+4
git-subtree.sh
+4
@@ -523,6 +523,10 @@ cmd_merge()
523
set $first_split
524
old=$1
525
sub=$2
526
+ if [ "$sub" = "$rev" ]; then
527
+ say "Subtree is already at commit $rev."
528
+ exit 0
529
+ fi
530
new=$(new_squash_commit "$old" "$sub" "$rev") || exit $?
531
debug "New squash commit: $new"
532
rev="$new"