Re: [PATCH 2/2] status -s: obey color.status
- From
Jeff King <peff@peff.net>
- Date
- Dec 7, 2009, 05:26 UTC
- Message-ID
- <20091207052625.GB17521@coredump.intra.peff.net>
- In-Reply-To
- <20091207051715.GA17521@coredump.intra.peff.net>
On Mon, Dec 07, 2009 at 12:17:15AM -0500, Jeff King wrote:
Show 5 quoted lines
> This seems to also turn on color for --porcelain in some cases, because > git_status_config unconditionally sets s->use_color if you are using > color.status instead of color.ui. I think we are probably best just > explicitly disabling options for the "porcelain" format rather than > trying to come up with some trickery to make sure they never get set.
Also, this means we can hoist repeated code out of the switch statement, like this:
-- >8 -- Subject: [PATCH] status: reduce duplicated setup code
We have three output formats: short, porcelain, and long. The short and long formats respect user-config, and the porcelain one does not. This led to us repeating config-related setup code for the short and long formats.
Since the last commit, color config is explicitly cleared when showing the porcelain format. Let's do the same with relative-path configuration, which enables us to hoist the duplicated code from the switch statement in cmd_status.
As a bonus, this fixes "commit --dry-run --porcelain", which was unconditionally setting up that configuration, anyway.
Signed-off-by: Jeff King <peff@peff.net> --- builtin-commit.c | 19 +++++++------------ wt-status.c | 2 ++ 2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c index 88b25aa..a11e585 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -1018,14 +1018,15 @@ int cmd_status(int argc, const char **argv, const char *prefix) s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0; wt_status_collect(&s); + if (s.relative_paths) + s.prefix = prefix; + if (s.use_color == -1) + s.use_color = git_use_color_default; + if (diff_use_color_default == -1) + diff_use_color_default = git_use_color_default; + switch (status_format) { case STATUS_FORMAT_SHORT: - if (s.relative_paths) - s.prefix = prefix; - if (s.use_color == -1) - s.use_color = git_use_color_default; - if (diff_use_color_default == -1) - diff_use_color_default = git_use_color_default; wt_shortstatus_print(&s, null_termination); break; case STATUS_FORMAT_PORCELAIN: @@ -1033,12 +1034,6 @@ int cmd_status(int argc, const char **argv, const char *prefix) break; case STATUS_FORMAT_LONG: s.verbose = verbose; - if (s.relative_paths) - s.prefix = prefix; - if (s.use_color == -1) - s.use_color = git_use_color_default; - if (diff_use_color_default == -1) - diff_use_color_default = git_use_color_default; wt_status_print(&s); break; } diff --git a/wt-status.c b/wt-status.c index e9bbfbc..55b6696 100644 --- a/wt-status.c +++ b/wt-status.c @@ -700,5 +700,7 @@ void wt_shortstatus_print(struct wt_status *s, int null_termination) void wt_porcelain_print(struct wt_status *s, int null_termination) { s->use_color = 0; + s->relative_paths = 0; + s->prefix = NULL; wt_shortstatus_print(s, null_termination); }
-- 1.6.6.rc1.292.gd8fe.dirty