merge: use return value of resolve_ref() to determine if HEAD is invalid

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index cd6e2c5e871230a43f504e165498139d8ec7a3d2..1fdfbd38654a83771f677f2219403e3713abef51 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -780,6 +780,13 @@ test_expect_success 'status -s submodule summary (clean submodule)' '
        test_cmp expect output
 '
 
+test_expect_success 'status -z implies porcelain' '
+       git status --porcelain |
+       perl -pe "s/\012/\000/g" >expect &&
+       git status -z >output &&
+       test_cmp expect output
+'
+
 cat >expect <<EOF
 # On branch master
 # Changes to be committed: