kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

surround %s with quotes when failed to lookup commit 

The output may become confusing to recognize if the user
accidentally gave an extra opening space, like:

   $ git commit --fixup=" 6d6360b67e99c2fd82d64619c971fdede98ee74b"
   fatal: could not lookup commit  6d6360b67e99c2fd82d64619c971fdede98ee74b

and it will be better if we surround the %s specifier with single quotes.

Signed-off-by: Teng Long <dyroneteng@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Teng Long 2023-05-29 21:27:56 +08:00 committed by Junio C Hamano
parent fe86abd751
commit e4cf013468
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/commit.c
View File

@ -763,7 +763,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
struct commit *c; struct commit *c;
c = lookup_commit_reference_by_name(squash_message); c = lookup_commit_reference_by_name(squash_message);
if (!c) 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(); ctx.output_encoding = get_commit_output_encoding();
repo_format_commit_message(the_repository, c, repo_format_commit_message(the_repository, c,
"squash! %s\n\n", &sb, "squash! %s\n\n", &sb,
@ -798,7 +798,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
char *fmt; char *fmt;
commit = lookup_commit_reference_by_name(fixup_commit); commit = lookup_commit_reference_by_name(fixup_commit);
if (!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(); ctx.output_encoding = get_commit_output_encoding();
fmt = xstrfmt("%s! %%s\n\n", fixup_prefix); fmt = xstrfmt("%s! %%s\n\n", fixup_prefix);
repo_format_commit_message(the_repository, commit, fmt, &sb, 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); commit = lookup_commit_reference_by_name(name);
if (!commit) if (!commit)
die(_("could not lookup commit %s"), name); die(_("could not lookup commit '%s'"), name);
out_enc = get_commit_output_encoding(); out_enc = get_commit_output_encoding();
return repo_logmsg_reencode(the_repository, commit, NULL, out_enc); return repo_logmsg_reencode(the_repository, commit, NULL, out_enc);
} }

2
builtin/merge-tree.c
View File

@ -448,7 +448,7 @@ static int real_merge(struct merge_tree_options *o,


base_commit = lookup_commit_reference_by_name(merge_base); base_commit = lookup_commit_reference_by_name(merge_base);
if (!base_commit) if (!base_commit)
die(_("could not lookup commit %s"), merge_base); die(_("could not lookup commit '%s'"), merge_base);


opt.ancestor = merge_base; opt.ancestor = merge_base;
base_tree = repo_get_commit_tree(the_repository, base_commit); base_tree = repo_get_commit_tree(the_repository, base_commit);