diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-27 23:01:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-27 23:01:32 -0800 |
| commit | c2ff10c98e22ae64d553273e6d67bb123a1c916f (patch) | |
| tree | 7ac3dec7bc0eeb688b538932b4d30f64d245d252 /wt-status.h | |
| parent | 67834b924044101a5d25f047746cfce7301bff1c (diff) | |
| parent | 3c5884536563518ce6cd4dc782b0ebb670bf3b6d (diff) | |
| download | git-c2ff10c98e22ae64d553273e6d67bb123a1c916f.tar.gz | |
Merge branch 'jk/1.7.0-status'
* jk/1.7.0-status:
status/commit: do not suggest "reset HEAD <path>" while merging
commit/status: "git add <path>" is not necessarily how to resolve
commit/status: check $GIT_DIR/MERGE_HEAD only once
t7508-status: test all modes with color
t7508-status: status --porcelain ignores relative paths setting
status: reduce duplicated setup code
status: disable color for porcelain format
status -s: obey color.status
builtin-commit: refactor short-status code into wt-status.c
t7508-status.sh: Add tests for status -s
status -s: respect the status.relativePaths option
docs: note that status configuration affects only long format
commit: support alternate status formats
status: add --porcelain output format
status: refactor format option parsing
status: refactor short-mode printing to its own function
status: typo fix in usage
git status: not "commit --dry-run" anymore
git stat -s: short status output
git stat: the beginning of "status that is not a dry-run of commit"
Conflicts:
t/t4034-diff-words.sh
wt-status.c
Diffstat (limited to 'wt-status.h')
| -rw-r--r-- | wt-status.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h index a0e75177be..c60f40a34a 100644 --- a/wt-status.h +++ b/wt-status.h @@ -31,8 +31,10 @@ struct wt_status { int is_initial; char *branch; const char *reference; + const char **pathspec; int verbose; int amend; + int in_merge; int nowarn; int use_color; int relative_paths; @@ -55,4 +57,7 @@ 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); +void wt_porcelain_print(struct wt_status *s, int null_termination); + #endif /* STATUS_H */ |