From: Josh Soref <jsoref@xxxxxxxxx>
Usually, it is easier to read a message if it makes its primary
point first, before giving a parenthetical note.
Possible messages before include:
` (nothing to squash)Already up to date.
`
and
`Already up to date. Yeeah!
`
After:
`Already up to date (nothing to squash).
`
and
`Already up to date.
`
Localizations now have two easy to understand translatable strings.
(All localizations of the previous strings are broken.)
Co-authored-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
Signed-off-by: Josh Soref <jsoref@xxxxxxxxx>
---
git-merge: rewrite already up to date message
GitHub Actions show things like:
* branch master -> FETCH_HEAD
(nothing to squash)Already up to date.
There was a code path where it would say:
Already up to date. Yeeah!
It is believed that other than being troublesome for localizers, this
message added no value, so it's being removed.
Usually, it is easier to read a message if it makes its primary point
first, before giving a parenthetical note.
The expected results are:
* branch master -> FETCH_HEAD
Already up to date (nothing to squash).
As well as an easier chance for localizers to actually translate the now
two messages. (As they don't have to fight string pasting. Which is a
localization sin.): Already up to date. Already up to date (nothing to
squash).
This commit should change that. Other than breaking anyone who actively
parses the output and all the localizations (and giving localizers a
real chance at localizing these messages), this shouldn't have much
impact.
Changes since v2:
* finish_up_to_date now figures out the answer on its own to address
feedback from Eric Sunshine
-- Yes, I'm well aware of localization rules. But as Eric Sunshine
noted, the code was already making a mess of things. I didn't want to
make invasive changes. I actually wrote roughly what Eric proposed as an
earlier implementation, but the various complexities, including trying
to figure out what the yeah was for and who cared about it, made me
really wary of proposing such a significant change.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-934%2Fjsoref%2Fnothing-to-squash-already-up-to-date-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-934/jsoref/nothing-to-squash-already-up-to-date-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/934
Range-diff vs v2:
1: 4f60e08195ea ! 1: a6c703603cda git-merge: move primary point before parenthetical
@@ Metadata
Author: Josh Soref <jsoref@xxxxxxxxx>
## Commit message ##
- git-merge: move primary point before parenthetical
+ git-merge: rewrite already up to date message
Usually, it is easier to read a message if it makes its primary
point first, before giving a parenthetical note.
- Before:
+ Possible messages before include:
` (nothing to squash)Already up to date.
`
+ and
+ `Already up to date. Yeeah!
+ `
After:
`Already up to date (nothing to squash).
`
+ and
+ `Already up to date.
+ `
+
+ Localizations now have two easy to understand translatable strings.
+ (All localizations of the previous strings are broken.)
+ Co-authored-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
Signed-off-by: Josh Soref <jsoref@xxxxxxxxx>
## builtin/merge.c ##
@@ builtin/merge.c: static void restore_state(const struct object_id *head,
- static void finish_up_to_date(const char *msg)
+ }
+
+ /* 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)
+- if (verbosity >= 0)
- printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg);
-+ printf(msg, squash ? _(" (nothing to squash)") : "");
++ 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);
}
@@ builtin/merge.c: int cmd_merge(int argc, const char **argv, const char *prefix)
* but first the most common case of merging one remote.
*/
- finish_up_to_date(_("Already up to date."));
-+ finish_up_to_date(_("Already up to date%s.\n"));
++ finish_up_to_date();
goto done;
} else if (fast_forward != FF_NO && !remoteheads->next &&
!common->next &&
@@ builtin/merge.c: 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(_("Already up to date%s. Yeeah!\n"));
++ finish_up_to_date();
goto done;
}
}
builtin/merge.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 062e91144125..f8c3d0687eaf 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -380,10 +380,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);
}
@@ -1482,7 +1486,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 &&
@@ -1566,7 +1570,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;
}
}
base-commit: 7a6a90c6ec48fc78c83d7090d6c1b95d8f3739c0
--
gitgitgadget
