diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-16 00:50:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-16 00:50:57 -0700 |
| commit | 132c6e443cb76d0baf9eece7b9424d25dc83a91d (patch) | |
| tree | 7eb4c96690840054ef2ae02d0065df114bc12808 | |
| parent | 578421fbd8db6602f290862f44843fc896b4fb0b (diff) | |
| parent | c14c3c82da9a46c65008060ad8e6dacef1a24ba9 (diff) | |
| download | git-132c6e443cb76d0baf9eece7b9424d25dc83a91d.tar.gz git-132c6e443cb76d0baf9eece7b9424d25dc83a91d.tar.xz | |
Merge branch 'dp/maint-rebase-fix'
* dp/maint-rebase-fix:
git-rebase--interactive: auto amend only edited commit
git-rebase-interactive: do not squash commits on abort
| -rwxr-xr-x | git-rebase--interactive.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 929d681c4..edb6ec6ed 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -284,7 +284,7 @@ do_next () { pick_one $sha1 || die_with_patch $sha1 "Could not apply $sha1... $rest" make_patch $sha1 - : > "$DOTEST"/amend + git rev-parse --verify HEAD > "$DOTEST"/amend warn "Stopped at $sha1... $rest" warn "You can amend the commit now, with" warn @@ -427,14 +427,22 @@ do else . "$DOTEST"/author-script || die "Cannot find the author identity" + amend= if test -f "$DOTEST"/amend then + amend=$(git rev-parse --verify HEAD) + test "$amend" = $(cat "$DOTEST"/amend) || + die "\ +You have uncommitted changes in your working tree. Please, commit them +first and then run 'git rebase --continue' again." git reset --soft HEAD^ || die "Cannot rewind the HEAD" fi export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE && - git commit --no-verify -F "$DOTEST"/message -e || - die "Could not commit staged changes." + git commit --no-verify -F "$DOTEST"/message -e || { + test -n "$amend" && git reset --soft $amend + die "Could not commit staged changes." + } fi require_clean_work_tree |