diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-21 01:53:10 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-21 01:53:10 +0300 |
| commit | ae196330213c5eecd0f01e57d58efb3fcf58f887 (patch) | |
| tree | 77dcb26bac12df0e841f0b1d4b80835490b55e33 | |
| parent | 06cff0c8d4be7367b97935f606caf0f428e38fb4 (diff) | |
| parent | e4cf01346831ec8f2d4d2bd4d325d2f152259c49 (diff) | |
Merge branch 'tl/quote-problematic-arg-for-clarity'
Error message fix.
* tl/quote-problematic-arg-for-clarity:
surround %s with quotes when failed to lookup commit
| -rw-r--r-- | builtin/commit.c | 6 | ||||
| -rw-r--r-- | builtin/merge-tree.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index e67c4be221..9ab57ea1aa 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -763,7 +763,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, struct commit *c; c = lookup_commit_reference_by_name(squash_message); if (!c) - die(_("could not lookup commit %s"), squash_message); + die(_("could not lookup commit '%s'"), squash_message); ctx.output_encoding = get_commit_output_encoding(); repo_format_commit_message(the_repository, c, "squash! %s\n\n", &sb, @@ -798,7 +798,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, char *fmt; commit = lookup_commit_reference_by_name(fixup_commit); if (!commit) - die(_("could not lookup commit %s"), fixup_commit); + die(_("could not lookup commit '%s'"), fixup_commit); ctx.output_encoding = get_commit_output_encoding(); fmt = xstrfmt("%s! %%s\n\n", fixup_prefix); repo_format_commit_message(the_repository, commit, fmt, &sb, @@ -1189,7 +1189,7 @@ static const char *read_commit_message(const char *name) commit = lookup_commit_reference_by_name(name); if (!commit) - die(_("could not lookup commit %s"), name); + die(_("could not lookup commit '%s'"), name); out_enc = get_commit_output_encoding(); return repo_logmsg_reencode(the_repository, commit, NULL, out_enc); } diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index b8f8a8b5d9..4325897a80 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -448,7 +448,7 @@ static int real_merge(struct merge_tree_options *o, base_commit = lookup_commit_reference_by_name(merge_base); if (!base_commit) - die(_("could not lookup commit %s"), merge_base); + die(_("could not lookup commit '%s'"), merge_base); opt.ancestor = merge_base; base_tree = repo_get_commit_tree(the_repository, base_commit); |