mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-status-porcelain-z-b' into HEAD

Browse Source 
* 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
This commit is contained in:
Jeff King
2012-05-08 04:55:35 -04:00
parent a3935e6791 d4a6bf1fb6
commit 5410ae422b
5 changed files with 105 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wt-status.h
View File

@ -57,6 +57,8 @@ struct wt_status {
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;
@ -73,8 +75,8 @@ void wt_status_prepare(struct wt_status *s);
void wt_status_print(struct wt_status *s);
void wt_status_collect(struct wt_status *s);
void wt_shortstatus_print(struct wt_status *s, int null_termination, int show_branch);
void wt_porcelain_print(struct wt_status *s, int null_termination);
void wt_shortstatus_print(struct wt_status *s);
void wt_porcelain_print(struct wt_status *s);
void status_printf_ln(struct wt_status *s, const char *color, const char *fmt, ...)
;