summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2011-05-26 13:43:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-29 13:00:10 -0700
commit000f97bd11e94fa8ede7fcdb43f5633997fed672 (patch)
treee38c37f3bb280af092b5c34072cb51f39dbc7061 /t
parentt7508: demonstrate status's failure to use --porcelain format with -z (diff)
downloadtgif-000f97bd11e94fa8ede7fcdb43f5633997fed672.tar.xz
builtin/commit.c: set status_format _after_ option parsing
'git status' should use --porcelain output format when -z is given. It was not doing so since the _effect_ of using -z, namely that null_termination would be set, was being checked _before_ option parsing was performed. So, move the check so that it is performed after option parsing. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7508-status.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 9bc9817f28..d4844abf13 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -364,7 +364,7 @@ test_expect_success 'status submodule summary (clean submodule)' '
test_cmp expect output
'
-test_expect_failure 'status -z implies porcelain' '
+test_expect_success 'status -z implies porcelain' '
git status --porcelain |
perl -pe "s/\012/\000/g" >expect &&
git status -z >output &&