зеркало из https://github.com/microsoft/git.git
remote.c: add braces in anticipation of a follow-up change
The CodingGuidelines say "When there are multiple arms to a conditional and some of them require braces, enclose even a single line block in braces for consistency.". Fix the code in match_explicit() to conform. While I'm at it change the if/else if/else in guess_ref() to use braces. This is not currently needed, but a follow-up change will add a new multi-line condition to that logic. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
d166e6afe5
Коммит
cab53989f6
16
remote.c
16
remote.c
|
@ -968,12 +968,13 @@ static char *guess_ref(const char *name, struct ref *peer)
|
||||||
if (!r)
|
if (!r)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (starts_with(r, "refs/heads/"))
|
if (starts_with(r, "refs/heads/")) {
|
||||||
strbuf_addstr(&buf, "refs/heads/");
|
strbuf_addstr(&buf, "refs/heads/");
|
||||||
else if (starts_with(r, "refs/tags/"))
|
} else if (starts_with(r, "refs/tags/")) {
|
||||||
strbuf_addstr(&buf, "refs/tags/");
|
strbuf_addstr(&buf, "refs/tags/");
|
||||||
else
|
} else {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
strbuf_addstr(&buf, name);
|
strbuf_addstr(&buf, name);
|
||||||
return strbuf_detach(&buf, NULL);
|
return strbuf_detach(&buf, NULL);
|
||||||
|
@ -1038,21 +1039,22 @@ static int match_explicit(struct ref *src, struct ref *dst,
|
||||||
case 1:
|
case 1:
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
if (starts_with(dst_value, "refs/"))
|
if (starts_with(dst_value, "refs/")) {
|
||||||
matched_dst = make_linked_ref(dst_value, dst_tail);
|
matched_dst = make_linked_ref(dst_value, dst_tail);
|
||||||
else if (is_null_oid(&matched_src->new_oid))
|
} else if (is_null_oid(&matched_src->new_oid)) {
|
||||||
error("unable to delete '%s': remote ref does not exist",
|
error("unable to delete '%s': remote ref does not exist",
|
||||||
dst_value);
|
dst_value);
|
||||||
else if ((dst_guess = guess_ref(dst_value, matched_src))) {
|
} else if ((dst_guess = guess_ref(dst_value, matched_src))) {
|
||||||
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 {
|
||||||
error("unable to push to unqualified destination: %s\n"
|
error("unable to push to unqualified destination: %s\n"
|
||||||
"The destination refspec neither matches an "
|
"The destination refspec neither matches an "
|
||||||
"existing ref on the remote nor\n"
|
"existing ref on the remote nor\n"
|
||||||
"begins with refs/, and we are unable to "
|
"begins with refs/, and we are unable to "
|
||||||
"guess a prefix based on the source ref.",
|
"guess a prefix based on the source ref.",
|
||||||
dst_value);
|
dst_value);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
matched_dst = NULL;
|
matched_dst = NULL;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче