diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:39 -0700 |
| commit | 01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b (patch) | |
| tree | 8df2b7b5111d783da4acad2d304341e108889ca3 /t/t3501-revert-cherry-pick.sh | |
| parent | a76b2084fb9c7e788108717fdce4c91227808980 (diff) | |
| parent | e0ef8495e98ae5ae796ec23bf438eef413557193 (diff) | |
| download | git-01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b.tar.gz git-01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b.tar.xz | |
Merge branch 'cc/cherry-pick-stdin'
* cc/cherry-pick-stdin:
revert: do not rebuild argv on heap
revert: accept arbitrary rev-list options
t3508 (cherry-pick): futureproof against unmerged files
Diffstat (limited to 't/t3501-revert-cherry-pick.sh')
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index e4fbf7a21..bc7aedd04 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -41,6 +41,24 @@ test_expect_success setup ' git tag rename2 ' +test_expect_success 'cherry-pick --nonsense' ' + + pos=$(git rev-parse HEAD) && + git diff --exit-code HEAD && + test_must_fail git cherry-pick --nonsense 2>msg && + git diff --exit-code HEAD "$pos" && + grep '[Uu]sage:' msg +' + +test_expect_success 'revert --nonsense' ' + + pos=$(git rev-parse HEAD) && + git diff --exit-code HEAD && + test_must_fail git revert --nonsense 2>msg && + git diff --exit-code HEAD "$pos" && + grep '[Uu]sage:' msg +' + test_expect_success 'cherry-pick after renaming branch' ' git checkout rename2 && |