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

push: move unqualified refname error into a function 

A follow-up change will extend this error message with the advice
facility. Doing so would make the indentation too deeply nested for
comfort. So let's split this into a helper function.

There's no changes to the wording here. Just code moving &
re-indentation, and re-flowing the "TRANSLATORS" comment.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2018-11-13 19:52:42 +00:00 committed by Junio C Hamano
parent c83cca3f74
commit 04d17287a0
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
remote.c
View File

@ -1005,6 +1005,26 @@ static int match_explicit_lhs(struct ref *src,
} }
} }


static void show_push_unqualified_ref_name_error(const char *dst_value,
const char *matched_src_name)
{
/*
* TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
* <remote> <src>:<dst>" push, and "being pushed ('%s')" is
* the <src>.
*/
error(_("The destination you provided is not a full refname (i.e.,\n"
"starting with \"refs/\"). We tried to guess what you meant by:\n"
"\n"
"- Looking for a ref that matches '%s' on the remote side.\n"
"- Checking if the <src> being pushed ('%s')\n"
" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
" refs/{heads,tags}/ prefix on the remote side.\n"
"\n"
"Neither worked, so we gave up. You must fully qualify the ref."),
dst_value, matched_src_name);
}

static int match_explicit(struct ref *src, struct ref *dst, static int match_explicit(struct ref *src, struct ref *dst,
struct ref ***dst_tail, struct ref ***dst_tail,
struct refspec_item *rs) struct refspec_item *rs)
@ -1049,22 +1069,8 @@ static int match_explicit(struct ref *src, struct ref *dst,
matched_dst = make_linked_ref(dst_guess, dst_tail); matched_dst = make_linked_ref(dst_guess, dst_tail);
free(dst_guess); free(dst_guess);
} else { } else {
/* show_push_unqualified_ref_name_error(dst_value,
* TRANSLATORS: "matches '%s'%" is the <dst> matched_src->name);
* part of "git push <remote> <src>:<dst>"
* push, and "being pushed ('%s')" is the
* <src>.
*/
error(_("The destination you provided is not a full refname (i.e.,\n"
"starting with \"refs/\"). We tried to guess what you meant by:\n"
"\n"
"- Looking for a ref that matches '%s' on the remote side.\n"
"- Checking if the <src> being pushed ('%s')\n"
" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
" refs/{heads,tags}/ prefix on the remote side.\n"
"\n"
"Neither worked, so we gave up. You must fully qualify the ref."),
dst_value, matched_src->name);
} }
break; break;
default: default: