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

diff --combined t/t3501-revert-cherry-pick.sh
index e4fbf7a2107c680ee5c51f2ccf5297ed1fd4d868,f61c54dfe2639d90aacae86f5f69ee6da68bafd0..bc7aedd0484ed5ad1115cac0f22943445d658f47
--- 1/t/t3501-revert-cherry-pick.sh
--- 2/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
  
  '