# [PATCH] Fix git-rebase -i to allow squashing of fast-forwardable commits

4 messages from 2007-07-12 to 2007-07-14. Participants: Alex Riesen, Junio C Hamano, Andy Parkins, Johannes Schindelin.
Thread: https://gitlist.dev/t/9012

## Alex Riesen, 2007-07-12 22:30

Subject: [PATCH] Fix git-rebase -i to allow squashing of fast-forwardable commits
Message-ID: <20070712223035.GB30532@steel.home>
URL: https://gitlist.dev/e/20070712223035.GB30532%40steel.home

```
Without this change the commits will be left standalone, with
duplicated commit message.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---

Noticed when trying to blend the second commit in a branch into the
first. Squash didn't work at all (apart from commit message
duplication).

 git-rebase--interactive.sh |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index d9563ec..f395076 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"
-- 
1.5.3.rc0.116.gc35c1-dirty

```

## Junio C Hamano, 2007-07-14 05:34

Subject: Re: [PATCH] Fix git-rebase -i to allow squashing of fast-forwardable commits
Message-ID: <7vejjbmtva.fsf@assigned-by-dhcp.cox.net>
URL: https://gitlist.dev/e/7vejjbmtva.fsf%40assigned-by-dhcp.cox.net
In-Reply-To: <20070712223035.GB30532@steel.home>

```
I think this makes sense.  Thanks for fixing it up.

```

## Andy Parkins, 2007-07-14 07:09

Subject: Re: [PATCH] Fix git-rebase -i to allow squashing of fast-forwardable commits
Message-ID: <200707140809.44619.andyparkins@gmail.com>
URL: https://gitlist.dev/e/200707140809.44619.andyparkins%40gmail.com
In-Reply-To: <7vejjbmtva.fsf@assigned-by-dhcp.cox.net>

```
On Saturday 2007, July 14, Junio C Hamano wrote:
> I think this makes sense.  Thanks for fixing it up.

I was experiencing the problem, and this patch fixed it.


Acked-by: Andy Parkins


-- 
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com

```

## Johannes Schindelin, 2007-07-14 09:53

Subject: Re: [PATCH] Fix git-rebase -i to allow squashing of fast-forwardable commits
Message-ID: <Pine.LNX.4.64.0707141052510.14781@racer.site>
URL: https://gitlist.dev/e/Pine.LNX.4.64.0707141052510.14781%40racer.site
In-Reply-To: <20070712223035.GB30532@steel.home>

```
Hi,

On Fri, 13 Jul 2007, Alex Riesen wrote:

> Without this change the commits will be left standalone, with
> duplicated commit message.

Thanks.

Ciao,
Dscho

```