Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2018-07-15 00:44:35 +0300
committerJunio C Hamano <gitster@pobox.com>2018-07-17 00:03:24 +0300
commit28fc9abd3faaadfb882f7cd4586a9e27b067a284 (patch)
treed02ab9b2b4fcb4084ca40413ed9797e9acbf3ffb /builtin/rerere.c
parentc5d1d13239ecd0d3ec93796a196f5ff0513a7c03 (diff)
rerere: wrap paths in output in sq
It looks like most paths in the output in the git codebase are wrapped in single quotes. Standardize on that in rerere as well. Apart from being more consistent, this also makes some of the strings match strings that are already translated in other parts of the codebase, thus reducing the work for translators, when the strings are marked for translation in a subsequent commit. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rerere.c')
-rw-r--r--builtin/rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c
index 0bc40298c24..e0c67c98e9a 100644
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -107,7 +107,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
const char *path = merge_rr.items[i].string;
const struct rerere_id *id = merge_rr.items[i].util;
if (diff_two(rerere_path(id, "preimage"), path, path, path))
- die("unable to generate diff for %s", rerere_path(id, NULL));
+ die("unable to generate diff for '%s'", rerere_path(id, NULL));
}
} else
usage_with_options(rerere_usage, options);