diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:49:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:49:05 -0700 |
| commit | 541b9cf1463334b1984a0b78a7180246415cb477 (patch) | |
| tree | dca0ebe9f75365e4b35ea44488dca0010afd0496 /t/t3507-cherry-pick-conflict.sh | |
| parent | Merge branch 'bk/submodule-in-recursive-merge' (diff) | |
| parent | Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi... (diff) | |
| download | tgif-541b9cf1463334b1984a0b78a7180246415cb477.tar.xz | |
Merge branch 'js/no-cherry-pick-head-after-punted'
* js/no-cherry-pick-head-after-punted:
cherry-pick: do not give irrelevant advice when cherry-pick punted
revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
| -rwxr-xr-x | t/t3507-cherry-pick-conflict.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 212ec54aaf..cb45574a7b 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -77,6 +77,21 @@ test_expect_success 'cherry-pick --no-commit does not set CHERRY_PICK_HEAD' ' test_must_fail git rev-parse --verify CHERRY_PICK_HEAD ' +test_expect_success 'cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD' ' + pristine_detach initial && + echo foo > foo && + test_must_fail git cherry-pick base && + test_must_fail git rev-parse --verify CHERRY_PICK_HEAD +' + +test_expect_success \ + 'cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD' ' + pristine_detach initial && + echo foo > foo && + test_must_fail git cherry-pick --strategy=resolve base && + test_must_fail git rev-parse --verify CHERRY_PICK_HEAD +' + test_expect_success 'GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD' ' pristine_detach initial && ( |