diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-05-11 09:27:22 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-11 09:27:22 +0300 |
commit | 5feebddd8683f40bc53de0f6ea0883fc13042dc3 (patch) | |
tree | 05c26b12b3eaa517ae046bdcf460519264623722 /builtin | |
parent | 8ca4771dd0889ce269780b5f2b48166ffaff9570 (diff) | |
parent | ad9322da033fac2678cab90988321549e0f1c86f (diff) |
Merge branch 'js/merge-already-up-to-date-message-reword'
A few variants of informational message "Already up-to-date" has
been rephrased.
* js/merge-already-up-to-date-message-reword:
merge: fix swapped "up to date" message components
merge(s): apply consistent punctuation to "up to date" messages
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/merge.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 388619536a..eddb8ae70d 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -393,10 +393,14 @@ static void restore_state(const struct object_id *head, } /* This is called when no merge was necessary. */ -static void finish_up_to_date(const char *msg) +static void finish_up_to_date(void) { - if (verbosity >= 0) - printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg); + if (verbosity >= 0) { + if (squash) + puts(_("Already up to date. (nothing to squash)")); + else + puts(_("Already up to date.")); + } remove_merge_branch_state(the_repository); } @@ -1522,7 +1526,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * If head can reach all the merge then we are up to date. * but first the most common case of merging one remote. */ - finish_up_to_date(_("Already up to date.")); + finish_up_to_date(); goto done; } else if (fast_forward != FF_NO && !remoteheads->next && !common->next && @@ -1610,7 +1614,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) } } if (up_to_date) { - finish_up_to_date(_("Already up to date. Yeeah!")); + finish_up_to_date(); goto done; } } |