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

diff --cc Documentation/git-status.txt
Simple merge

diff --cc builtin/commit.c
index a876a73e6b4c1f1690839ce2d447a4b77573c9f5,e2d9cbe3e387340e14103473e984f5b382df3134..b15e3119d672e753a5196f7ee7767f26c48af182
--- 1/builtin/commit.c
--- 2/builtin/commit.c
+++ b/builtin/commit.c
@@@ -1256,10 -1203,8 +1201,10 @@@ int cmd_status(int argc, const char **a
        argc = parse_options(argc, argv, prefix,
                             builtin_status_options,
                             builtin_status_usage, 0);
 +      finalize_colopts(&colopts, -1);
 +      s.colopts = colopts;
  
-       if (null_termination && status_format == STATUS_FORMAT_LONG)
+       if (s.null_termination && status_format == STATUS_FORMAT_LONG)
                status_format = STATUS_FORMAT_PORCELAIN;
  
        handle_untracked_files_arg(&s);

diff --cc t/t7508-status.sh
Simple merge

diff --cc wt-status.c
Simple merge

diff --cc wt-status.h
index 6dd7207e25eb0292ba6630c9521c0eae719bb11d,ab3c7cc8a130002c855a4f398c8ee9372c79144b..f4c949bed21093189d2f5cefb61ec6c9c7b8abdd
--- 1/wt-status.h
--- 2/wt-status.h
+++ b/wt-status.h
@@@ -56,7 -56,8 +56,9 @@@ struct wt_status 
        enum untracked_status_type show_untracked_files;
        const char *ignore_submodule_arg;
        char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN];
 +      int colopts;
+       int null_termination;
+       int show_branch;
  
        /* These are computed during processing of the individual sections */
        int commitable;