mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'jg/status-config'
"git status" learned status.branch and status.short configuration variables to use --branch and --short options by default (override with --no-branch and --no-short options from the command line). * jg/status-config: status/commit: make sure --porcelain is not affected by user-facing config commit: make it work with status.short status: introduce status.branch to enable --branch by default status: introduce status.short to enable --short by default
This commit is contained in:
commit
e29497d28c
|
@ -2112,6 +2112,14 @@ status.relativePaths::
|
|||
relative to the repository root (this was the default for Git
|
||||
prior to v1.5.4).
|
||||
|
||||
status.short::
|
||||
Set to true to enable --short by default in linkgit:git-status[1].
|
||||
The option --no-short takes precedence over this variable.
|
||||
|
||||
status.branch::
|
||||
Set to true to enable --branch by default in linkgit:git-status[1].
|
||||
The option --no-branch takes precedence over this variable.
|
||||
|
||||
status.showUntrackedFiles::
|
||||
By default, linkgit:git-status[1] and linkgit:git-commit[1] show
|
||||
files which are not currently tracked by Git. Directories which
|
||||
|
|
|
@ -112,12 +112,14 @@ static int show_ignored_in_status, have_option_m;
|
|||
static const char *only_include_assumed;
|
||||
static struct strbuf message = STRBUF_INIT;
|
||||
|
||||
static enum {
|
||||
static enum status_format {
|
||||
STATUS_FORMAT_NONE = 0,
|
||||
STATUS_FORMAT_LONG,
|
||||
STATUS_FORMAT_SHORT,
|
||||
STATUS_FORMAT_PORCELAIN
|
||||
} status_format;
|
||||
STATUS_FORMAT_PORCELAIN,
|
||||
|
||||
STATUS_FORMAT_UNSPECIFIED
|
||||
} status_format = STATUS_FORMAT_UNSPECIFIED;
|
||||
|
||||
static int opt_parse_m(const struct option *opt, const char *arg, int unset)
|
||||
{
|
||||
|
@ -460,6 +462,9 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
|
|||
case STATUS_FORMAT_PORCELAIN:
|
||||
wt_porcelain_print(s);
|
||||
break;
|
||||
case STATUS_FORMAT_UNSPECIFIED:
|
||||
die("BUG: finalize_deferred_config() should have been called");
|
||||
break;
|
||||
case STATUS_FORMAT_NONE:
|
||||
case STATUS_FORMAT_LONG:
|
||||
wt_status_print(s);
|
||||
|
@ -961,6 +966,42 @@ static const char *read_commit_message(const char *name)
|
|||
return logmsg_reencode(commit, NULL, out_enc);
|
||||
}
|
||||
|
||||
/*
|
||||
* Enumerate what needs to be propagated when --porcelain
|
||||
* is not in effect here.
|
||||
*/
|
||||
static struct status_deferred_config {
|
||||
enum status_format status_format;
|
||||
int show_branch;
|
||||
} status_deferred_config = {
|
||||
STATUS_FORMAT_UNSPECIFIED,
|
||||
-1 /* unspecified */
|
||||
};
|
||||
|
||||
static void finalize_deferred_config(struct wt_status *s)
|
||||
{
|
||||
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;
|
||||
if (status_format == STATUS_FORMAT_UNSPECIFIED)
|
||||
status_format = STATUS_FORMAT_NONE;
|
||||
|
||||
if (use_deferred_config && s->show_branch < 0)
|
||||
s->show_branch = status_deferred_config.show_branch;
|
||||
if (s->show_branch < 0)
|
||||
s->show_branch = 0;
|
||||
}
|
||||
|
||||
static int parse_and_validate_options(int argc, const char *argv[],
|
||||
const struct option *options,
|
||||
const char * const usage[],
|
||||
|
@ -971,6 +1012,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
|
|||
int f = 0;
|
||||
|
||||
argc = parse_options(argc, argv, prefix, options, usage, 0);
|
||||
finalize_deferred_config(s);
|
||||
|
||||
if (force_author && !strchr(force_author, '>'))
|
||||
force_author = find_author_by_nickname(force_author);
|
||||
|
@ -1055,12 +1097,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;
|
||||
|
||||
|
@ -1113,6 +1149,17 @@ static int git_status_config(const char *k, const char *v, void *cb)
|
|||
s->submodule_summary = -1;
|
||||
return 0;
|
||||
}
|
||||
if (!strcmp(k, "status.short")) {
|
||||
if (git_config_bool(k, v))
|
||||
status_deferred_config.status_format = STATUS_FORMAT_SHORT;
|
||||
else
|
||||
status_deferred_config.status_format = STATUS_FORMAT_NONE;
|
||||
return 0;
|
||||
}
|
||||
if (!strcmp(k, "status.branch")) {
|
||||
status_deferred_config.show_branch = git_config_bool(k, v);
|
||||
return 0;
|
||||
}
|
||||
if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
|
||||
s->use_color = git_config_colorbool(k, v);
|
||||
return 0;
|
||||
|
@ -1155,8 +1202,8 @@ int cmd_status(int argc, const char **argv, const char *prefix)
|
|||
OPT__VERBOSE(&verbose, N_("be verbose")),
|
||||
OPT_SET_INT('s', "short", &status_format,
|
||||
N_("show status concisely"), STATUS_FORMAT_SHORT),
|
||||
OPT_BOOLEAN('b', "branch", &s.show_branch,
|
||||
N_("show branch information")),
|
||||
OPT_BOOL('b', "branch", &s.show_branch,
|
||||
N_("show branch information")),
|
||||
OPT_SET_INT(0, "porcelain", &status_format,
|
||||
N_("machine-readable output"),
|
||||
STATUS_FORMAT_PORCELAIN),
|
||||
|
@ -1189,13 +1236,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
|
|||
builtin_status_options,
|
||||
builtin_status_usage, 0);
|
||||
finalize_colopts(&s.colopts, -1);
|
||||
|
||||
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"));
|
||||
}
|
||||
finalize_deferred_config(&s);
|
||||
|
||||
handle_untracked_files_arg(&s);
|
||||
if (show_ignored_in_status)
|
||||
|
@ -1224,6 +1265,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)
|
|||
case STATUS_FORMAT_PORCELAIN:
|
||||
wt_porcelain_print(&s);
|
||||
break;
|
||||
case STATUS_FORMAT_UNSPECIFIED:
|
||||
die("BUG: finalize_deferred_config() should have been called");
|
||||
break;
|
||||
case STATUS_FORMAT_NONE:
|
||||
case STATUS_FORMAT_LONG:
|
||||
s.verbose = verbose;
|
||||
|
@ -1392,7 +1436,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
|
|||
OPT_BOOLEAN(0, "dry-run", &dry_run, N_("show what would be committed")),
|
||||
OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
|
||||
STATUS_FORMAT_SHORT),
|
||||
OPT_BOOLEAN(0, "branch", &s.show_branch, N_("show branch information")),
|
||||
OPT_BOOL(0, "branch", &s.show_branch, N_("show branch information")),
|
||||
OPT_SET_INT(0, "porcelain", &status_format,
|
||||
N_("machine-readable output"), STATUS_FORMAT_PORCELAIN),
|
||||
OPT_SET_INT(0, "long", &status_format,
|
||||
|
@ -1433,6 +1477,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
|
|||
wt_status_prepare(&s);
|
||||
gitmodules_config();
|
||||
git_config(git_commit_config, &s);
|
||||
status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
|
||||
determine_whence(&s);
|
||||
s.colopts = 0;
|
||||
|
||||
|
|
|
@ -1335,4 +1335,66 @@ test_expect_failure '.git/config ignore=all suppresses submodule summary' '
|
|||
git config -f .gitmodules --remove-section submodule.subname
|
||||
'
|
||||
|
||||
test_expect_success 'setup of test environment' '
|
||||
git config status.showUntrackedFiles no &&
|
||||
git status -s >expected_short &&
|
||||
git status --no-short >expected_noshort
|
||||
'
|
||||
|
||||
test_expect_success '"status.short=true" same as "-s"' '
|
||||
git -c status.short=true status >actual &&
|
||||
test_cmp expected_short actual
|
||||
'
|
||||
|
||||
test_expect_success '"status.short=true" weaker than "--no-short"' '
|
||||
git -c status.short=true status --no-short >actual &&
|
||||
test_cmp expected_noshort actual
|
||||
'
|
||||
|
||||
test_expect_success '"status.short=false" same as "--no-short"' '
|
||||
git -c status.short=false status >actual &&
|
||||
test_cmp expected_noshort actual
|
||||
'
|
||||
|
||||
test_expect_success '"status.short=false" weaker than "-s"' '
|
||||
git -c status.short=false status -s >actual &&
|
||||
test_cmp expected_short actual
|
||||
'
|
||||
|
||||
test_expect_success '"status.branch=true" same as "-b"' '
|
||||
git status -sb >expected_branch &&
|
||||
git -c status.branch=true status -s >actual &&
|
||||
test_cmp expected_branch actual
|
||||
'
|
||||
|
||||
test_expect_success '"status.branch=true" different from "--no-branch"' '
|
||||
git status -s --no-branch >expected_nobranch &&
|
||||
git -c status.branch=true status -s >actual &&
|
||||
test_must_fail test_cmp expected_nobranch actual
|
||||
'
|
||||
|
||||
test_expect_success '"status.branch=true" weaker than "--no-branch"' '
|
||||
git -c status.branch=true status -s --no-branch >actual &&
|
||||
test_cmp expected_nobranch actual
|
||||
'
|
||||
|
||||
test_expect_success '"status.branch=true" weaker than "--porcelain"' '
|
||||
git -c status.branch=true status --porcelain >actual &&
|
||||
test_cmp expected_nobranch actual
|
||||
'
|
||||
|
||||
test_expect_success '"status.branch=false" same as "--no-branch"' '
|
||||
git -c status.branch=false status -s >actual &&
|
||||
test_cmp expected_nobranch actual
|
||||
'
|
||||
|
||||
test_expect_success '"status.branch=false" weaker than "-b"' '
|
||||
git -c status.branch=false status -sb >actual &&
|
||||
test_cmp expected_branch actual
|
||||
'
|
||||
|
||||
test_expect_success 'Restore default test environment' '
|
||||
git config --unset status.showUntrackedFiles
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
@ -127,6 +127,7 @@ void wt_status_prepare(struct wt_status *s)
|
|||
s->change.strdup_strings = 1;
|
||||
s->untracked.strdup_strings = 1;
|
||||
s->ignored.strdup_strings = 1;
|
||||
s->show_branch = -1; /* unspecified */
|
||||
}
|
||||
|
||||
static void wt_status_print_unmerged_header(struct wt_status *s)
|
||||
|
|
Loading…
Reference in a new issue