Merge branch 'jk/maint-status-porcelain-z-b' into HEAD
authorJeff King <peff@peff.net>
Tue, 8 May 2012 08:55:35 +0000 (04:55 -0400)
committerJeff King <peff@peff.net>
Tue, 8 May 2012 08:55:35 +0000 (04:55 -0400)
* 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

1  2 
Documentation/git-status.txt
builtin/commit.c
t/t7508-status.sh
wt-status.c
wt-status.h

Simple merge
@@@ -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);
Simple merge
diff --cc wt-status.c
Simple merge
diff --cc 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;