diff: fix crash with --find-object outside repository
When "git diff --find-object=<oid>" is run outside a git repository, the option parsing callback eagerly resolves the OID via repo_get_oid(), which reaches get_main_ref_store() and hits a BUG() assertion because no repository has been set up. Check startup_info->have_repository before attempting to resolve the OID, and return a user-friendly error instead. Signed-off-by: Michael Montalbo <mmontalbo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Montalbo committed
Feb 28, 2026 at 20:31 UTC
b0ddc7947cc6f0a077543204a96710c53daa48a5
2 files changed
+12
diff.c
+2
index 90e8003dd1..fd9aedbec7 100644
--- a/diff.c
+++ b/diff.c
@@ -5139,6 +5139,8 @@ static int diff_opt_find_object(const struct option *option,
struct object_id oid;
BUG_ON_OPT_NEG(unset);
+ if (!startup_info->have_repository)
+ return error(_("--find-object requires a git repository"));
if (repo_get_oid(the_repository, arg, &oid))
return error(_("unable to resolve '%s'"), arg);
t/t4053-diff-no-index.sh
+10
index 5e5bad61ca..d5fcfbe407 100755
--- a/t/t4053-diff-no-index.sh
+++ b/t/t4053-diff-no-index.sh
@@ -59,6 +59,16 @@ test_expect_success 'git diff --no-index executed outside repo gives correct err
)
'
+test_expect_success 'git diff --find-object outside repo fails gracefully' '
+ (
+ GIT_CEILING_DIRECTORIES=$TRASH_DIRECTORY/non &&
+ export GIT_CEILING_DIRECTORIES &&
+ cd non/git &&
+ test_must_fail git diff --find-object=abc123 2>err &&
+ test_grep "find-object requires a git repository" err
+ )
+'
+
test_expect_success 'diff D F and diff F D' '
(
cd repo &&