git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Patrick Steinhardt <ps@pks.im>
Subject: [PATCH v4 2/3] remote.c: convert if-else ladder to switch
Date: Thu, 7 Aug 2025 21:41:11 -0700	[thread overview]
Message-ID: <ee6d69bcafeda9d8a2cdfd1f8bb62c28c13941f9.1754627874.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1754627874.git.liu.denton@gmail.com>

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>
---
 remote.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/remote.c b/remote.c
index 88f991795b..61e2c9951a 100644
--- a/remote.c
+++ b/remote.c
@@ -1171,7 +1171,6 @@ static void show_push_unqualified_ref_name_error(const char *dst_value,
 						 const char *matched_src_name)
 {
 	struct object_id oid;
-	enum object_type type;
 
 	/*
 	 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
@@ -1196,28 +1195,33 @@ static void show_push_unqualified_ref_name_error(const char *dst_value,
 		BUG("'%s' is not a valid object, "
 		    "match_explicit_lhs() should catch this!",
 		    matched_src_name);
-	type = odb_read_object_info(the_repository->objects, &oid, NULL);
-	if (type == OBJ_COMMIT) {
+
+	switch (odb_read_object_info(the_repository->objects, &oid, NULL)) {
+	case OBJ_COMMIT:
 		advise(_("The <src> part of the refspec is a commit object.\n"
 			 "Did you mean to create a new branch by pushing to\n"
 			 "'%s:refs/heads/%s'?"),
 		       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"
 			 "Did you mean to create a new tag by pushing to\n"
 			 "'%s:refs/tags/%s'?"),
 		       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"
 			 "Did you mean to tag a new tree by pushing to\n"
 			 "'%s:refs/tags/%s'?"),
 		       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"
 			 "Did you mean to tag a new blob by pushing to\n"
 			 "'%s:refs/tags/%s'?"),
 		       matched_src_name, dst_value);
-	} else {
+		break;
+	default:
 		BUG("'%s' should be commit/tag/tree/blob, is '%d'",
 		    matched_src_name, type);
 	}
-- 
2.50.1


  parent reply	other threads:[~2025-08-08  4:41 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-04  9:42 [PATCH 0/2] remote.c: remove erroneous BUG case Denton Liu
2025-08-04  9:43 ` [PATCH 1/2] t5516: introduce 'push ref expression with non-existent oid src' Denton Liu
2025-08-04  9:43 ` [PATCH 2/2] remote.c: remove BUG in show_push_unqualified_ref_name_error() Denton Liu
2025-08-04 14:19   ` Junio C Hamano
2025-08-05  6:24 ` [PATCH v2 0/2] *** SUBJECT HERE *** Denton Liu
2025-08-05  6:24   ` [PATCH v2 1/2] t5516: introduce 'push ref expression with non-existent oid src' Denton Liu
2025-08-05 13:28     ` Patrick Steinhardt
2025-08-05 17:12       ` Junio C Hamano
2025-08-05  6:24   ` [PATCH v2 2/2] remote.c: remove BUG in show_push_unqualified_ref_name_error() Denton Liu
2025-08-05 13:27     ` Patrick Steinhardt
2025-08-06  4:53   ` [PATCH v3 0/2] remote.c: remove erroneous BUG case Denton Liu
2025-08-06  4:53     ` [PATCH v3 1/2] t5516: remove surrounding empty lines in test bodies Denton Liu
2025-08-06  6:14       ` Patrick Steinhardt
2025-08-06  4:53     ` [PATCH v3 2/2] remote.c: remove BUG in show_push_unqualified_ref_name_error() Denton Liu
2025-08-06  6:14       ` Patrick Steinhardt
2025-08-06 15:17         ` Junio C Hamano
2025-08-07  4:30           ` [PATCH] remote.c: convert if-else tower to switch Denton Liu
2025-08-07  4:38             ` Patrick Steinhardt
2025-08-07  9:20             ` [PATCH v2] " Denton Liu
2025-08-07 12:35               ` Ben Knoble
2025-08-07 17:19                 ` Eric Sunshine
2025-08-07 15:02             ` [PATCH] " Junio C Hamano
2025-08-08  4:41     ` [PATCH v4 0/3] remote.c: remove erroneous BUG case Denton Liu
2025-08-08  4:41       ` [PATCH v4 1/3] t5516: remove surrounding empty lines in test bodies Denton Liu
2025-08-08  4:41       ` Denton Liu [this message]
2025-08-08  5:43         ` [PATCH v4 2/3] remote.c: convert if-else ladder to switch Patrick Steinhardt
2025-08-08  7:14           ` Denton Liu
2025-08-08  4:41       ` [PATCH v4 3/3] remote.c: remove BUG in show_push_unqualified_ref_name_error() Denton Liu
2025-08-08  7:24       ` [PATCH v5 0/3] remote.c: remove erroneous BUG case Denton Liu
2025-08-08  7:24         ` [PATCH v5 1/3] t5516: remove surrounding empty lines in test bodies Denton Liu
2025-08-08  7:24         ` [PATCH v5 2/3] remote.c: remove BUG in show_push_unqualified_ref_name_error() Denton Liu
2025-08-08  7:24         ` [PATCH v5 3/3] remote.c: convert if-else ladder to switch Denton Liu
2025-08-08  7:28         ` [PATCH v5 0/3] remote.c: remove erroneous BUG case Patrick Steinhardt
2025-08-08 16:06           ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ee6d69bcafeda9d8a2cdfd1f8bb62c28c13941f9.1754627874.git.liu.denton@gmail.com \
    --to=liu.denton@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).