worktree: combine two translatable messages
These two messages differ only by the config key name, which should not be translated. Extract those keys so the messages can be translated from the same string. Reported-by: Jean-Noël AVILA <jn.avila@free.fr> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Feb 23, 2022 at 14:29 UTC
92d92345ce5996933f5cfc357dce1e1744487b6a
1 file changed
+4
-2
builtin/worktree.c
+4
-2
index c6eb636329..7c272078dc 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -384,11 +384,13 @@ static int add_worktree(const char *path, const char *refname,
bare &&
git_config_set_multivar_in_file_gently(
to_file, "core.bare", NULL, "true", 0))
- error(_("failed to unset 'core.bare' in '%s'"), to_file);
+ error(_("failed to unset '%s' in '%s'"),
+ "core.bare", to_file);
if (!git_configset_get_value(&cs, "core.worktree", &core_worktree) &&
git_config_set_in_file_gently(to_file,
"core.worktree", NULL))
- error(_("failed to unset 'core.worktree' in '%s'"), to_file);
+ error(_("failed to unset '%s' in '%s'"),
+ "core.worktree", to_file);
git_configset_clear(&cs);
}