Merge branch 'cc/multi-promisor'

diff --git a/t/t4136-apply-check.sh b/t/t4136-apply-check.sh
index 6d9287231826ece18873b531186907cd75ef7461..4c3f264a633b770445e116edfac83872b47916bf 100755 (executable)
--- a/t/t4136-apply-check.sh
+++ b/t/t4136-apply-check.sh
@@ -29,6 +29,18 @@ test_expect_success 'apply exits non-zero with no-op patch' '
        test_must_fail git apply --check input
 '
 
+test_expect_success '`apply --recount` allows no-op patch' '
+       echo 1 >1 &&
+       git apply --recount --check <<-\EOF
+       diff --get a/1 b/1
+       index 6696ea4..606eddd 100644
+       --- a/1
+       +++ b/1
+       @@ -1,1 +1,1 @@
+        1
+       EOF
+'
+
 test_expect_success 'invalid combination: create and copy' '
        test_must_fail git apply --check - <<-\EOF
        diff --git a/1 b/2