mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
6c92972d7f
|
@ -1207,9 +1207,6 @@ int cmd_status(int argc, const char **argv, const char *prefix)
|
|||
if (argc == 2 && !strcmp(argv[1], "-h"))
|
||||
usage_with_options(builtin_status_usage, builtin_status_options);
|
||||
|
||||
if (null_termination && status_format == STATUS_FORMAT_LONG)
|
||||
status_format = STATUS_FORMAT_PORCELAIN;
|
||||
|
||||
wt_status_prepare(&s);
|
||||
gitmodules_config();
|
||||
git_config(git_status_config, &s);
|
||||
|
@ -1217,6 +1214,10 @@ int cmd_status(int argc, const char **argv, const char *prefix)
|
|||
argc = parse_options(argc, argv, prefix,
|
||||
builtin_status_options,
|
||||
builtin_status_usage, 0);
|
||||
|
||||
if (null_termination && status_format == STATUS_FORMAT_LONG)
|
||||
status_format = STATUS_FORMAT_PORCELAIN;
|
||||
|
||||
handle_untracked_files_arg(&s);
|
||||
if (show_ignored_in_status)
|
||||
s.show_ignored_files = 1;
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue