status: update short status to respect --no-ahead-behind

diff --git a/t/t4136-apply-check.sh b/t/t4136-apply-check.sh
index a321f7c245da531cb8fea495a5e7ba02b3a6463b..6d9287231826ece18873b531186907cd75ef7461 100755 (executable)
--- a/t/t4136-apply-check.sh
+++ b/t/t4136-apply-check.sh
@@ -16,4 +16,35 @@ 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_expect_success 'invalid combination: create and copy' '
+       test_must_fail git apply --check - <<-\EOF
+       diff --git a/1 b/2
+       new file mode 100644
+       copy from 1
+       copy to 2
+       EOF
+'
+
+test_expect_success 'invalid combination: create and rename' '
+       test_must_fail git apply --check - <<-\EOF
+       diff --git a/1 b/2
+       new file mode 100644
+       rename from 1
+       rename to 2
+       EOF
+'
+
 test_done