diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-29 10:20:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-29 10:22:55 -0700 |
| commit | 65281b70caf9dcf926c6649c8c20ef8891d6f3c3 (patch) | |
| tree | 832390dc1381d8af0a5ea63e164e6b106facc15c /t | |
| parent | revert: accept arbitrary rev-list options (diff) | |
| parent | DWIM 'git show -5' to 'git show --do-walk -5' (diff) | |
| download | tgif-65281b70caf9dcf926c6649c8c20ef8891d6f3c3.tar.xz | |
Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin
* commit 'v1.7.2-rc0~6^2':
DWIM 'git show -5' to 'git show --do-walk -5'
Documentation/SubmittingPatches: Fix typo in GMail section
Documentation/config: describe status.submodulesummary
This commit fixes one test in t3508 by making "cherry-pick -<num>"
walk the history.
A test update from Elijah Newren is squashed as an evil merge.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3508-cherry-pick-many-commits.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index 93d7189fbc..f90ed3da3e 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -82,7 +82,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' ' git diff --quiet HEAD first ' -test_expect_failure 'cherry-pick -3 fourth works' ' +test_expect_success 'cherry-pick -3 fourth works' ' git checkout -f master && git reset --hard first && test_tick && |