From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jun 2010 18:55:39 +0000 (-0700)
Subject: Merge branch 'cc/cherry-pick-stdin'
X-Git-Tag: v1.7.2-rc1~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b?hp=-c

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
---

01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b
diff --combined t/t3501-revert-cherry-pick.sh
index e4fbf7a210,f61c54dfe2..bc7aedd048
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@@ -41,14 -41,31 +41,32 @@@ 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 &&
  	git cherry-pick added &&
  	test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
  	test -f opos &&
 -	grep "Add extra line at the end" opos
 +	grep "Add extra line at the end" opos &&
 +	git reflog -1 | grep cherry-pick
  
  '
  
@@@ -58,8 -75,7 +76,8 @@@ test_expect_success 'revert after renam
  	git revert added &&
  	test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
  	test -f spoo &&
 -	! grep "Add extra line at the end" spoo
 +	! grep "Add extra line at the end" spoo &&
 +	git reflog -1 | grep revert
  
  '