Browse Source

Don't squash-merge if the old and new commits are the same.

maint
Avery Pennarun 16 years ago
parent
commit
eb4fb91094
  1. 4
      git-subtree.sh

4
git-subtree.sh

@ -523,6 +523,10 @@ cmd_merge() @@ -523,6 +523,10 @@ cmd_merge()
set $first_split
old=$1
sub=$2
if [ "$sub" = "$rev" ]; then
say "Subtree is already at commit $rev."
exit 0
fi
new=$(new_squash_commit "$old" "$sub" "$rev") || exit $?
debug "New squash commit: $new"
rev="$new"

Loading…
Cancel
Save