undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix git-rebase -i to allow squashing of fast-forwardable commits

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

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alex Riesen 2007-07-13 00:30:35 +02:00 committed by Junio C Hamano
parent 9a4cbdca34
commit 793ad04198
1 changed files with 3 additions and 2 deletions

5
git-rebase--interactive.sh
View File

@ -84,6 +84,7 @@ pick_one () {
current_sha1=$(git rev-parse --verify HEAD) current_sha1=$(git rev-parse --verify HEAD)
if [ $current_sha1 = $parent_sha1 ]; then if [ $current_sha1 = $parent_sha1 ]; then
git reset --hard $sha1 git reset --hard $sha1
test "a$1" = a-n && git reset --soft $current_sha1
sha1=$(git rev-parse --short $sha1) sha1=$(git rev-parse --short $sha1)
warn Fast forward to $sha1 warn Fast forward to $sha1
else else
@ -193,14 +194,14 @@ do_next () {
die "Cannot 'squash' without a previous commit" die "Cannot 'squash' without a previous commit"
mark_action_done mark_action_done
failed=f
pick_one -n $sha1 || failed=t
MSG="$DOTEST"/message MSG="$DOTEST"/message
echo "# This is a combination of two commits." > "$MSG" echo "# This is a combination of two commits." > "$MSG"
echo "# The first commit's message is:" >> "$MSG" echo "# The first commit's message is:" >> "$MSG"
echo >> "$MSG" echo >> "$MSG"
git cat-file commit HEAD | sed -e '1,/^$/d' >> "$MSG" git cat-file commit HEAD | sed -e '1,/^$/d' >> "$MSG"
echo >> "$MSG" echo >> "$MSG"
failed=f
pick_one -n $sha1 || failed=t
echo "# And this is the 2nd commit message:" >> "$MSG" echo "# And this is the 2nd commit message:" >> "$MSG"
echo >> "$MSG" echo >> "$MSG"
git cat-file commit $sha1 | sed -e '1,/^$/d' >> "$MSG" git cat-file commit $sha1 | sed -e '1,/^$/d' >> "$MSG"