diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-09-25 16:42:36 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-09-25 17:46:43 -0700 |
| commit | be6ff208d8248c3f282df14fdf3c08db57e92007 (patch) | |
| tree | a3ae81af74765b69ad51beef03b3ee62ad269b27 /t | |
| parent | Make merge-recursive honor diff.renamelimit (diff) | |
| download | tgif-be6ff208d8248c3f282df14fdf3c08db57e92007.tar.xz | |
rebase -i: commit when continuing after "edit"
When doing an "edit" on a commit, editing and git-adding some files,
"git rebase -i" complained about a missing "author-script". The idea was
that the user would call "git commit --amend" herself.
But we can be nice and do that for the user.
Noticed by Dmitry Potapov.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 718c9c1fa3..1af73a47c6 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -80,7 +80,7 @@ cat "$1".tmp action=pick for line in $FAKE_LINES; do case $line in - squash) + squash|edit) action="$line";; *) echo sed -n "${line}s/^pick/$action/p" @@ -297,4 +297,16 @@ test_expect_success 'ignore patch if in upstream' ' test $HEAD = $(git rev-parse HEAD^) ' +test_expect_success '--continue tries to commit, even for "edit"' ' + parent=$(git rev-parse HEAD^) && + test_tick && + FAKE_LINES="edit 1" git rebase -i HEAD^ && + echo edited > file7 && + git add file7 && + FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue && + test edited = $(git show HEAD:file7) && + git show HEAD | grep chouette && + test $parent = $(git rev-parse HEAD^) +' + test_done |