Junio C Hamano <gits...@pobox.com> writes:
> We use "unspecified" value to initialize the main variables
> (status_format global and s->show_branch), and also prepare
> "from-config" counterpart variables. After we read both, we figure
> out which one should be used, while resetting the main variables to
> their default if neither mechanism touched them.
>
> builtin/commit.c | 55
> ++++++++++++++++++++++++++++++++++++++++++++++---------
> t/t7508-status.sh | 5 +++++
> wt-status.c | 1 +
> 3 files changed, 52 insertions(+), 9 deletions(-)
At least that needs this on top to deal with the late defaulting of
"-z".
We know we do not want deferred configuration values when the
command line says "--porcelain" or "-z". And after handling the
"-z" to set status_format, we apply config only if we want deferred
configuration and command line left them unspecified. And finally
we apply the default if both config and command line left them
unspecified.
builtin/commit.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index a535eb2..6f8cb04 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -977,7 +977,16 @@ static struct status_deferred_config {
static void finalize_deferred_config(struct wt_status *s)
{
- int use_deferred_config = (status_format != STATUS_FORMAT_PORCELAIN);
+ int use_deferred_config = (status_format != STATUS_FORMAT_PORCELAIN &&
+ !s->null_termination);
+
+ if (s->null_termination) {
+ if (status_format == STATUS_FORMAT_NONE ||
+ status_format == STATUS_FORMAT_UNSPECIFIED)
+ status_format = STATUS_FORMAT_PORCELAIN;
+ else if (status_format == STATUS_FORMAT_LONG)
+ die(_("--long and -z are incompatible"));
+ }
if (use_deferred_config && status_format == STATUS_FORMAT_UNSPECIFIED)
status_format = status_deferred_config.status_format;
@@ -1085,12 +1094,6 @@ static int parse_and_validate_options(int argc, const
char *argv[],
if (all && argc > 0)
die(_("Paths with -a does not make sense."));
- if (s->null_termination) {
- if (status_format == STATUS_FORMAT_NONE)
- status_format = STATUS_FORMAT_PORCELAIN;
- else if (status_format == STATUS_FORMAT_LONG)
- die(_("--long and -z are incompatible"));
- }
if (status_format != STATUS_FORMAT_NONE)
dry_run = 1;
@@ -1232,13 +1235,6 @@ int cmd_status(int argc, const char **argv, const char
*prefix)
finalize_colopts(&s.colopts, -1);
finalize_deferred_config(&s);
- if (s.null_termination) {
- if (status_format == STATUS_FORMAT_NONE)
- status_format = STATUS_FORMAT_PORCELAIN;
- else if (status_format == STATUS_FORMAT_LONG)
- die(_("--long and -z are incompatible"));
- }
-
handle_untracked_files_arg(&s);
if (show_ignored_in_status)
s.show_ignored_files = 1;
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
