Merge branch 'da/difftool-mergetool-simplify-reporting-status'
[gitweb.git] / t / t3501-revert-cherry-pick.sh
index bff6ffe08817ed0c057909aa1d3f93140cf6a3e0..51f3bbb8af446dd24a835a8593475b59a73f6d1f 100755 (executable)
@@ -129,4 +129,16 @@ test_expect_success 'cherry-pick "-" is meaningless without checkout' '
        )
 '
 
+test_expect_success 'cherry-pick "-" works with arguments' '
+       git checkout -b side-branch &&
+       test_commit change actual change &&
+       git checkout master &&
+       git cherry-pick -s - &&
+       echo "Signed-off-by: C O Mitter <committer@example.com>" >expect &&
+       git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
+       test_cmp expect signoff &&
+       echo change >expect &&
+       test_cmp expect actual
+'
+
 test_done