diff options
| author | Stephen P. Smith <ischis2@cox.net> | 2018-09-06 03:53:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-08 00:37:43 +0300 |
| commit | 6fa9019494f018c560a3979be604f27d12e95659 (patch) | |
| tree | 87ba429448d7831e58b93a958224fb8c0125f8e6 /wt-status.c | |
| parent | c01d8f94591679fd55b0f899e6fc24555c11485a (diff) | |
wt-status: rename commitable to committable
Fix variable spelling error.
Signed-off-by: Stephen P. Smith <ischis2@cox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wt-status.c b/wt-status.c index 180faf6ba7..4962b5bc83 100644 --- a/wt-status.c +++ b/wt-status.c @@ -786,7 +786,7 @@ static void wt_longstatus_print_updated(struct wt_status *s) continue; if (!shown_header) { wt_longstatus_print_cached_header(s); - s->commitable = 1; + s->committable = 1; shown_header = 1; } wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it); @@ -1021,7 +1021,7 @@ static void wt_longstatus_print_verbose(struct wt_status *s) rev.diffopt.use_color = 0; wt_status_add_cut_line(s->fp); } - if (s->verbose > 1 && s->commitable) { + if (s->verbose > 1 && s->committable) { /* print_updated() printed a header, so do we */ if (s->fp != stdout) wt_longstatus_print_trailer(s); @@ -1089,7 +1089,7 @@ static void show_merge_in_progress(struct wt_status *s, _(" (use \"git merge --abort\" to abort the merge)")); } } else { - s-> commitable = 1; + s-> committable = 1; status_printf_ln(s, color, _("All conflicts fixed but you are still merging.")); if (s->hints) @@ -1665,14 +1665,14 @@ static void wt_longstatus_print(struct wt_status *s) "new files yourself (see 'git help status')."), s->untracked_in_ms / 1000.0); } - } else if (s->commitable) + } else if (s->committable) status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"), s->hints ? _(" (use -u option to show untracked files)") : ""); if (s->verbose) wt_longstatus_print_verbose(s); - if (!s->commitable) { + if (!s->committable) { if (s->amend) status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes")); else if (s->nowarn) |