diff options
| author | Mike Hommey <mh@glandium.org> | 2007-11-08 08:03:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-11 17:04:59 -0800 |
| commit | fb6e4e1f3f048898677f3cf177bfcaf60123bd5c (patch) | |
| tree | 01155796459a196d41c9a755df66aaa31b0df008 /t/t3403-rebase-skip.sh | |
| parent | 40e2524da9f9fb2806a66a694b9aee722ea3ef0a (diff) | |
| download | git-fb6e4e1f3f048898677f3cf177bfcaf60123bd5c.tar.gz git-fb6e4e1f3f048898677f3cf177bfcaf60123bd5c.tar.xz | |
Do git reset --hard HEAD when using git rebase --skip
When you have a merge conflict and want to bypass the commit causing it,
you don't want to care about the dirty state of the working tree.
Also, don't git reset --hard HEAD in the rebase-skip test, so that the
lack of support for this is detected.
Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3403-rebase-skip.sh')
| -rwxr-xr-x | t/t3403-rebase-skip.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index eab053c3e..becabfc33 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -36,7 +36,6 @@ test_expect_failure 'rebase with git am -3 (default)' ' ' test_expect_success 'rebase --skip with am -3' ' - git reset --hard HEAD && git rebase --skip ' test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge' @@ -44,7 +43,6 @@ test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge' test_expect_failure 'rebase with --merge' 'git rebase --merge master' test_expect_success 'rebase --skip with --merge' ' - git reset --hard HEAD && git rebase --skip ' |