git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4 2/3] remote.c: convert if-else ladder to switch

From
Patrick Steinhardt <ps@pks.im>
Date
Aug 8, 2025, 05:43 UTC
Message-ID
<aJWOcDN2LZaMzaqH@pks.im>
In-Reply-To
<ee6d69bcafeda9d8a2cdfd1f8bb62c28c13941f9.1754627874.git.liu.denton@gmail.com>
On Thu, Aug 07, 2025 at 09:41:11PM -0700, Denton Liu wrote:
Show 9 quoted lines
> 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;
Show 39 quoted lines
> @@ -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);

We can't remove the `type` variable in this patch already -- it's still used by this call to `BUG()`. But we can drop the variable in the next patch, where that call is converted to `advise()`.

So I'd recommend to either move this patch to after the next patch or to keep the `type` variable here and remove it in the next patch.

Patrick
Previous: Denton LiuNext: Denton Liu
Message 26 of 34 in “remote.c: remove erroneous BUG case”
  1. 0/2 remote.c: remove erroneous BUG caseDenton Liu, Aug 4, 2025
  2. 1/2 t5516: introduce 'push ref expression with non-existent oid src'Denton Liu, Aug 4, 2025
  3. 2/2 remote.c: remove BUG in show_push_unqualified_ref_name_error()Denton Liu, Aug 4, 2025
  4. Junio C HamanoAug 4, 2025
  5. 0/2 *** SUBJECT HERE ***Denton Liu, Aug 5, 2025
  6. 1/2 t5516: introduce 'push ref expression with non-existent oid src'Denton Liu, Aug 5, 2025
  7. Patrick SteinhardtAug 5, 2025
  8. Junio C HamanoAug 5, 2025
  9. 2/2 remote.c: remove BUG in show_push_unqualified_ref_name_error()Denton Liu, Aug 5, 2025
  10. Patrick SteinhardtAug 5, 2025
  11. 0/2 remote.c: remove erroneous BUG caseDenton Liu, Aug 6, 2025
  12. 1/2 t5516: remove surrounding empty lines in test bodiesDenton Liu, Aug 6, 2025
  13. Patrick SteinhardtAug 6, 2025
  14. 2/2 remote.c: remove BUG in show_push_unqualified_ref_name_error()Denton Liu, Aug 6, 2025
  15. Patrick SteinhardtAug 6, 2025
  16. Junio C HamanoAug 6, 2025
  17. remote.c: convert if-else tower to switchDenton Liu, Aug 7, 2025
  18. Patrick SteinhardtAug 7, 2025
  19. remote.c: convert if-else tower to switchDenton Liu, Aug 7, 2025
  20. Ben KnobleAug 7, 2025
  21. Eric SunshineAug 7, 2025
  22. Junio C HamanoAug 7, 2025
  23. 0/3 remote.c: remove erroneous BUG caseDenton Liu, Aug 8, 2025
  24. 1/3 t5516: remove surrounding empty lines in test bodiesDenton Liu, Aug 8, 2025
  25. 2/3 remote.c: convert if-else ladder to switchDenton Liu, Aug 8, 2025
  26. Patrick SteinhardtAug 8, 2025
  27. Denton LiuAug 8, 2025
  28. 3/3 remote.c: remove BUG in show_push_unqualified_ref_name_error()Denton Liu, Aug 8, 2025
  29. 0/3 remote.c: remove erroneous BUG caseDenton Liu, Aug 8, 2025
  30. 1/3 t5516: remove surrounding empty lines in test bodiesDenton Liu, Aug 8, 2025
  31. 2/3 remote.c: remove BUG in show_push_unqualified_ref_name_error()Denton Liu, Aug 8, 2025
  32. 3/3 remote.c: convert if-else ladder to switchDenton Liu, Aug 8, 2025
  33. Patrick SteinhardtAug 8, 2025
  34. Junio C HamanoAug 8, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.