diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-06 11:40:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-06 11:40:08 -0700 |
| commit | 6c92972d7f5ab247a8cab5e4b88cb281bf201970 (patch) | |
| tree | 2a5100a10d4b91a59dea75ef73184142479c8963 /t | |
| parent | Sync with 1.7.5.4 (diff) | |
| parent | builtin/commit.c: set status_format _after_ option parsing (diff) | |
| download | tgif-6c92972d7f5ab247a8cab5e4b88cb281bf201970.tar.xz | |
Merge branch 'bc/maint-status-z-to-use-porcelain'
* bc/maint-status-z-to-use-porcelain:
builtin/commit.c: set status_format _after_ option parsing
t7508: demonstrate status's failure to use --porcelain format with -z
Conflicts:
builtin/commit.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7508-status.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index cd6e2c5e87..1fdfbd3865 100755 --- 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: |