diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-25 00:43:09 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-27 21:59:42 +0400 |
| commit | fb47cfbd59b12ea67e1a5c6a9d0bd665fcae4581 (patch) | |
| tree | ee9bd166d2cbc97374b99b22fe1cabc8a7eaba5f /git-rebase--interactive.sh | |
| parent | 7ab3cc70a6aad2e4f8ccaa98e5520aa126eaef8f (diff) | |
rebase -i: fix interrupted squashing
When a squashing merge failed, the first commit would not be replaced,
due to "git reset --soft" being called with an unmerged index.
Noticed by Uwe Kleine-König.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 9a88335c5f..c987311499 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -260,8 +260,8 @@ do_next () { esac failed=f - pick_one -n $sha1 || failed=t output git reset --soft HEAD^ + pick_one -n $sha1 || failed=t author_script=$(get_author_ident_from_commit $sha1) echo "$author_script" > "$DOTEST"/author-script case $failed in |