diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-01 13:28:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-01 13:28:19 -0700 |
| commit | 264d5a717bb450ae06969face25c70b000e1358f (patch) | |
| tree | b816c0d32dc6088e6decf22284493796626eb7b0 /t | |
| parent | Merge branch 'vr/rebase-autosquash-does-not-imply-i' (diff) | |
| parent | cherry-pick: regression fix for empty commits (diff) | |
| download | tgif-264d5a717bb450ae06969face25c70b000e1358f.tar.xz | |
Merge branch 'nh/empty-rebase'
* nh/empty-rebase:
cherry-pick: regression fix for empty commits
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3505-cherry-pick-empty.sh | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh index 92f00cdf84..5a1340cee6 100755 --- a/t/t3505-cherry-pick-empty.sh +++ b/t/t3505-cherry-pick-empty.sh @@ -71,4 +71,34 @@ test_expect_success 'cherry pick with --keep-redundant-commits' ' git cherry-pick --keep-redundant-commits HEAD^ ' +test_expect_success 'cherry-pick a commit that becomes no-op (prep)' ' + git checkout master && + git branch fork && + echo foo >file2 && + git add file2 && + test_tick && + git commit -m "add file2 on master" && + + git checkout fork && + echo foo >file2 && + git add file2 && + test_tick && + git commit -m "add file2 on the side" +' + +test_expect_success 'cherry-pick a no-op without --keep-redundant' ' + git reset --hard && + git checkout fork^0 && + test_must_fail git cherry-pick master +' + +test_expect_success 'cherry-pick a no-op with --keep-redundant' ' + git reset --hard && + git checkout fork^0 && + git cherry-pick --keep-redundant-commits master && + git show -s --format='%s' >actual && + echo "add file2 on master" >expect && + test_cmp expect actual +' + test_done |