undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cherry-pick: demonstrate option amnesia

Browse Source 
When cherry-pick stops for a conflict resolution it forgets
--allow-empty --allow-empty-message and --keep-redundant-commits.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2019-03-13 18:26:14 +00:00 committed by Junio C Hamano
parent f59199d5fa
commit 36b0503a19
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
t/t3507-cherry-pick-conflict.sh
View File

@ -25,6 +25,11 @@ test_expect_success setup '
test_commit base foo b && test_commit base foo b &&
test_commit picked foo c && test_commit picked foo c &&
test_commit --signoff picked-signed foo d && test_commit --signoff picked-signed foo d &&
git checkout -b topic initial &&
test_commit redundant-pick foo c redundant &&
git commit --allow-empty --allow-empty-message &&
git tag empty &&
git checkout master &&
git config advice.detachedhead false git config advice.detachedhead false
' '
@ -405,4 +410,23 @@ test_expect_success 'cherry-pick preserves sparse-checkout' '
test_i18ngrep ! "Changes not staged for commit:" actual test_i18ngrep ! "Changes not staged for commit:" actual
' '
test_expect_failure 'cherry-pick --continue remembers --keep-redundant-commits' '
test_when_finished "git cherry-pick --abort || :" &&
pristine_detach initial &&
test_must_fail git cherry-pick --keep-redundant-commits picked redundant &&
echo c >foo &&
git add foo &&
git cherry-pick --continue
'
test_expect_failure 'cherry-pick --continue remembers --allow-empty and --allow-empty-message' '
test_when_finished "git cherry-pick --abort || :" &&
pristine_detach initial &&
test_must_fail git cherry-pick --allow-empty --allow-empty-message \
picked empty &&
echo c >foo &&
git add foo &&
git cherry-pick --continue
'
test_done test_done