remote.c: convert if-else ladder to switch
For better readability, convert the if-else ladder into a switch statement. Suggested-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
b33c590e4f
commit
dfbfc2221b
19
remote.c
19
remote.c
|
|
@ -1157,7 +1157,6 @@ static void show_push_unqualified_ref_name_error(const char *dst_value,
|
||||||
const char *matched_src_name)
|
const char *matched_src_name)
|
||||||
{
|
{
|
||||||
struct object_id oid;
|
struct object_id oid;
|
||||||
enum object_type type;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
|
* TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
|
||||||
|
|
@ -1182,31 +1181,37 @@ static void show_push_unqualified_ref_name_error(const char *dst_value,
|
||||||
BUG("'%s' is not a valid object, "
|
BUG("'%s' is not a valid object, "
|
||||||
"match_explicit_lhs() should catch this!",
|
"match_explicit_lhs() should catch this!",
|
||||||
matched_src_name);
|
matched_src_name);
|
||||||
type = oid_object_info(the_repository, &oid, NULL);
|
|
||||||
if (type == OBJ_COMMIT) {
|
switch (oid_object_info(the_repository, &oid, NULL)) {
|
||||||
|
case OBJ_COMMIT:
|
||||||
advise(_("The <src> part of the refspec is a commit object.\n"
|
advise(_("The <src> part of the refspec is a commit object.\n"
|
||||||
"Did you mean to create a new branch by pushing to\n"
|
"Did you mean to create a new branch by pushing to\n"
|
||||||
"'%s:refs/heads/%s'?"),
|
"'%s:refs/heads/%s'?"),
|
||||||
matched_src_name, dst_value);
|
matched_src_name, dst_value);
|
||||||
} else if (type == OBJ_TAG) {
|
break;
|
||||||
|
case OBJ_TAG:
|
||||||
advise(_("The <src> part of the refspec is a tag object.\n"
|
advise(_("The <src> part of the refspec is a tag object.\n"
|
||||||
"Did you mean to create a new tag by pushing to\n"
|
"Did you mean to create a new tag by pushing to\n"
|
||||||
"'%s:refs/tags/%s'?"),
|
"'%s:refs/tags/%s'?"),
|
||||||
matched_src_name, dst_value);
|
matched_src_name, dst_value);
|
||||||
} else if (type == OBJ_TREE) {
|
break;
|
||||||
|
case OBJ_TREE:
|
||||||
advise(_("The <src> part of the refspec is a tree object.\n"
|
advise(_("The <src> part of the refspec is a tree object.\n"
|
||||||
"Did you mean to tag a new tree by pushing to\n"
|
"Did you mean to tag a new tree by pushing to\n"
|
||||||
"'%s:refs/tags/%s'?"),
|
"'%s:refs/tags/%s'?"),
|
||||||
matched_src_name, dst_value);
|
matched_src_name, dst_value);
|
||||||
} else if (type == OBJ_BLOB) {
|
break;
|
||||||
|
case OBJ_BLOB:
|
||||||
advise(_("The <src> part of the refspec is a blob object.\n"
|
advise(_("The <src> part of the refspec is a blob object.\n"
|
||||||
"Did you mean to tag a new blob by pushing to\n"
|
"Did you mean to tag a new blob by pushing to\n"
|
||||||
"'%s:refs/tags/%s'?"),
|
"'%s:refs/tags/%s'?"),
|
||||||
matched_src_name, dst_value);
|
matched_src_name, dst_value);
|
||||||
} else {
|
break;
|
||||||
|
default:
|
||||||
advise(_("The <src> part of the refspec ('%s') "
|
advise(_("The <src> part of the refspec ('%s') "
|
||||||
"is an object ID that doesn't exist.\n"),
|
"is an object ID that doesn't exist.\n"),
|
||||||
matched_src_name);
|
matched_src_name);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue