From: Josh Soref <jsoref@xxxxxxxxx>
Signed-off-by: Josh Soref <jsoref@xxxxxxxxx>
---
git-merge: move space to between strings
GitHub Actions show things like:
* branch master -> FETCH_HEAD
(nothing to squash)Already up to date.
The expected results are:
* branch master -> FETCH_HEAD
(nothing to squash) Already up to date.
This commit should change that. Other than breaking all the
localizations, and anyone who actively parses the output, this shouldn't
have much impact.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-934%2Fjsoref%2Fnothing-to-squash-already-up-to-date-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-934/jsoref/nothing-to-squash-already-up-to-date-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/934
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 062e91144125..0d8c782cccb2 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -383,7 +383,7 @@ static void restore_state(const struct object_id *head,
static void finish_up_to_date(const char *msg)
{
if (verbosity >= 0)
- printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg);
+ printf("%s%s\n", squash ? _("(nothing to squash) ") : "", msg);
remove_merge_branch_state(the_repository);
}
base-commit: 7a6a90c6ec48fc78c83d7090d6c1b95d8f3739c0
--
gitgitgadget
