mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/cherry-pick-strategy-option'

Browse Source 
* jn/cherry-pick-strategy-option:
  cherry-pick/revert: add support for -X/--strategy-option
This commit is contained in:
Junio C Hamano
2011-02-09 16:41:16 -08:00
parent a8e4a5943a 67ac1e1d57
commit 06938a37dc
7 changed files with 97 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
t/t3032-merge-recursive-options.sh
View File

@ -110,6 +110,20 @@ test_expect_success '--ignore-space-change makes merge succeed' '
git merge-recursive --ignore-space-change HEAD^ -- HEAD remote
'
test_expect_success 'naive cherry-pick fails' '
git read-tree --reset -u HEAD &&
test_must_fail git cherry-pick --no-commit remote &&
git read-tree --reset -u HEAD &&
test_must_fail git cherry-pick remote &&
test_must_fail git update-index --refresh &&
grep "<<<<<<" text.txt
'
test_expect_success '-Xignore-space-change makes cherry-pick succeed' '
git read-tree --reset -u HEAD &&
git cherry-pick --no-commit -Xignore-space-change remote
'
test_expect_success '--ignore-space-change: our w/s-only change wins' '
q_to_cr <<-\EOF >expected &&
justice and holiness and is the nurse of his age and theQ