diff options
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 6176dd2c2f..dd545daba7 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1105,7 +1105,7 @@ static const char *read_commit_message(const char *name) static struct status_deferred_config { enum wt_status_format status_format; int show_branch; - int show_inprogress; + int show_in_progress; } status_deferred_config = { STATUS_FORMAT_UNSPECIFIED, -1, /* unspecified */ @@ -1135,10 +1135,10 @@ static void finalize_deferred_config(struct wt_status *s) s->show_branch = status_deferred_config.show_branch; if (s->show_branch < 0) s->show_branch = 0; - if (use_deferred_config && s->show_inprogress < 0) - s->show_inprogress = status_deferred_config.show_inprogress; - if (s->show_inprogress < 0) - s->show_inprogress = 0; + if (use_deferred_config && s->show_in_progress < 0) + s->show_in_progress = status_deferred_config.show_in_progress; + if (s->show_in_progress < 0) + s->show_in_progress = 0; } static int parse_and_validate_options(int argc, const char *argv[], @@ -1298,7 +1298,7 @@ static int git_status_config(const char *k, const char *v, void *cb) return 0; } if (!strcmp(k, "status.inprogress")) { - status_deferred_config.show_inprogress = git_config_bool(k, v); + status_deferred_config.show_in_progress = git_config_bool(k, v); return 0; } if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) { @@ -1349,7 +1349,7 @@ int cmd_status(int argc, const char **argv, const char *prefix) N_("show status concisely"), STATUS_FORMAT_SHORT), OPT_BOOL('b', "branch", &s.show_branch, N_("show branch information")), - OPT_BOOL('p', "inprogress", &s.show_inprogress, + OPT_BOOL(0, "in-progress", &s.show_in_progress, N_("show in-progress information")), { OPTION_CALLBACK, 0, "porcelain", &status_format, N_("version"), N_("machine-readable output"), @@ -1624,7 +1624,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) OPT_SET_INT(0, "short", &status_format, N_("show status concisely"), STATUS_FORMAT_SHORT), OPT_BOOL(0, "branch", &s.show_branch, N_("show branch information")), - OPT_BOOL(0, "inprogress", &s.show_inprogress, N_("show in-progress information")), + OPT_BOOL(0, "in-progress", &s.show_in_progress, N_("show in-progress information")), OPT_SET_INT(0, "porcelain", &status_format, N_("machine-readable output"), STATUS_FORMAT_PORCELAIN), OPT_SET_INT(0, "long", &status_format, |