diff options
| author |  Jeff King <peff@peff.net> | 2012-05-08 04:55:35 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-05-08 04:55:35 -0400 |
| commit | 5410ae422b0f3cfe604d393addcd13526e940112 (patch) | |
| tree | e8273858fa5355dfefb5212eebd3289cfcf46c7d /t | |
| parent | The ninth batch of topics graduated to 'master' (diff) | |
| parent | status: respect "-b" for porcelain format (diff) | |
| download | tgif-5410ae422b0f3cfe604d393addcd13526e940112.tar.xz | |
Merge branch 'jk/maint-status-porcelain-z-b' into HEAD
* jk/maint-status-porcelain-z-b:
status: respect "-b" for porcelain format
status: fix null termination with "-b"
status: refactor null_termination option
commit: refactor option parsing
Conflicts:
wt-status.h
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7508-status.sh | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 8f5cfac331..28e184829c 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -295,6 +295,15 @@ test_expect_success 'status -s -b' ' ' +test_expect_success 'status -s -z -b' ' + tr "\\n" Q <expect >expect.q && + mv expect.q expect && + git status -s -z -b >output && + nul_to_q <output >output.q && + mv output.q output && + test_cmp expect output +' + test_expect_success 'setup dir3' ' mkdir dir3 && : >dir3/untracked1 && @@ -671,9 +680,14 @@ test_expect_success 'status --porcelain ignores color.status' ' git config --unset color.status git config --unset color.ui -test_expect_success 'status --porcelain ignores -b' ' +test_expect_success 'status --porcelain respects -b' ' git status --porcelain -b >output && + { + echo "## master" && + cat expect + } >tmp && + mv tmp expect && test_cmp expect output ' |