From 793ad04198a79c14094bd1311a9c42f1293c6183 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Fri, 13 Jul 2007 00:30:35 +0200 Subject: [PATCH] Fix git-rebase -i to allow squashing of fast-forwardable commits Without this change the commits will be left standalone, with duplicated commit message. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index d9563ec46f..f3950767ea 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -84,6 +84,7 @@ pick_one () { current_sha1=$(git rev-parse --verify HEAD) if [ $current_sha1 = $parent_sha1 ]; then git reset --hard $sha1 + test "a$1" = a-n && git reset --soft $current_sha1 sha1=$(git rev-parse --short $sha1) warn Fast forward to $sha1 else @@ -193,14 +194,14 @@ do_next () { die "Cannot 'squash' without a previous commit" mark_action_done - failed=f - pick_one -n $sha1 || failed=t MSG="$DOTEST"/message echo "# This is a combination of two commits." > "$MSG" echo "# The first commit's message is:" >> "$MSG" echo >> "$MSG" git cat-file commit HEAD | sed -e '1,/^$/d' >> "$MSG" echo >> "$MSG" + failed=f + pick_one -n $sha1 || failed=t echo "# And this is the 2nd commit message:" >> "$MSG" echo >> "$MSG" git cat-file commit $sha1 | sed -e '1,/^$/d' >> "$MSG" -- 2.11.4.GIT