mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-22 17:09:18 +02:00
Code

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

Browse Source
This commit is contained in:
Avery Pennarun 2009-05-30 03:33:17 -04:00
parent 1cc2cfff91
commit eb4fb91094
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-subtree.sh
View File

@ -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"