From: Jeff King <peff@peff.net>
Date: Tue, 8 May 2012 08:55:35 +0000 (-0400)
Subject: Merge branch 'jk/maint-status-porcelain-z-b' into HEAD
X-Git-Tag: v1.7.11-rc0~42^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5410ae422b0f3cfe604d393addcd13526e940112;p=thirdparty%2Fgit.git

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
---

5410ae422b0f3cfe604d393addcd13526e940112
diff --cc builtin/commit.c
index a876a73e6b,e2d9cbe3e3..b15e3119d6
--- a/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 wt-status.h
index 6dd7207e25,ab3c7cc8a1..f4c949bed2
--- a/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;