Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'

diff --git a/t/t4136-apply-check.sh b/t/t4136-apply-check.sh
index a321f7c245da531cb8fea495a5e7ba02b3a6463b..4b0a374b63f4128405c88fdb2410fb679bdd06a1 100755 (executable)
--- a/t/t4136-apply-check.sh
+++ b/t/t4136-apply-check.sh
@@ -16,4 +16,17 @@ test_expect_success 'apply --check exits non-zero with unrecognized input' '
        EOF
 '
 
+test_expect_success 'apply exits non-zero with no-op patch' '
+       cat >input <<-\EOF &&
+       diff --get a/1 b/1
+       index 6696ea4..606eddd 100644
+       --- a/1
+       +++ b/1
+       @@ -1,1 +1,1 @@
+        1
+       EOF
+       test_must_fail git apply --stat input &&
+       test_must_fail git apply --check input
+'
+
 test_done