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>
Subject: [PATCH 2/2] remote.c: remove BUG in show_push_unqualified_ref_name_error()
Date: Mon, 4 Aug 2025 02:43:05 -0700	[thread overview]
Message-ID: <3eb95731ea07c5f25ed7a47cc639f53b4b18e113.1754300389.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1754300389.git.liu.denton@gmail.com>

In the case where a non-existent oid is given as the <src> for a
refspec and the destination is unqualified, we end up hitting the BUG in
show_push_unqualified_ref_name_error().

This is because before hitting this advise message, the <src> is passed
through repo_get_oid() which, upon receiving a fully qualified oid,
doesn't actually check the existence of the object and just returns
found. This means that it's actually possible for the
odb_read_object_info() call to return not found under normal usage and
thus, it's not actually a bug.

Replace the BUG() with an advise() displaying a helpful message about
the oid possibly not existing.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
 remote.c              | 5 +++--
 t/t5516-fetch-push.sh | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/remote.c b/remote.c
index e965f022f1..9fb76049d2 100644
--- a/remote.c
+++ b/remote.c
@@ -1218,8 +1218,9 @@ static void show_push_unqualified_ref_name_error(const char *dst_value,
 			 "'%s:refs/tags/%s'?"),
 		       matched_src_name, dst_value);
 	} else {
-		BUG("'%s' should be commit/tag/tree/blob, is '%d'",
-		    matched_src_name, type);
+		advise(_("The <src> part of the refspec is an oid that doesn't exist.\n"
+			 "Please ensure that the oid '%s' is correct."),
+		       matched_src_name);
 	}
 }
 
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index c2fcfeca92..e064ea7433 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -509,7 +509,7 @@ test_expect_success 'push ref expression with non-existent, incomplete dest' '
 
 '
 
-test_expect_failure 'push ref expression with non-existent oid src' '
+test_expect_success 'push ref expression with non-existent oid src' '
 
 	mk_test testrepo &&
 	test_must_fail git push testrepo $(test_oid 001):branch
-- 
2.50.1


  parent reply	other threads:[~2025-08-04  9:43 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 ` Denton Liu [this message]
2025-08-04 14:19   ` [PATCH 2/2] remote.c: remove BUG in show_push_unqualified_ref_name_error() 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       ` [PATCH v4 2/3] remote.c: convert if-else ladder to switch Denton Liu
2025-08-08  5:43         ` 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=3eb95731ea07c5f25ed7a47cc639f53b4b18e113.1754300389.git.liu.denton@gmail.com \
    --to=liu.denton@gmail.com \
    --cc=git@vger.kernel.org \
    /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).