builtin/show-ref: treat directory as non-existing in --exists
9080a7f178 (builtin/show-ref: add new mode to check for reference existence, 2023-10-31) added the option --exists to git-show-ref(1). When you use this option against a ref that doesn't exist, but it is a parent directory of an existing ref, you get the following error: $ git show-ref --exists refs/heads error: failed to look up reference: Is a directory when the ref-files backend is in use. To be more clear to user, hide the error about having found a directory. What matters to the user is that the named ref does not exist. Instead, print the same error as when the ref was not found: error: reference does not exist Signed-off-by: Toon Claes <toon@iotcl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Toon Claes committed
Jan 10, 2024 at 15:15 UTC
0aabeaa562fa269834f10cbda6e966b553dcec71
2 files changed
+3
-3
builtin/show-ref.c
+1
-1
@@ -239,7 +239,7 @@ static int cmd_show_ref__exists(const char **refs)
239
if (refs_read_raw_ref(get_main_ref_store(the_repository), ref,
240
&unused_oid, &unused_referent, &unused_type,
241
&failure_errno)) {
242
- if (failure_errno == ENOENT) {
242
+ if (failure_errno == ENOENT || failure_errno == EISDIR) {
243
error(_("reference does not exist"));
244
ret = 2;
245
} else {
t/t1403-show-ref.sh
+2
-2
@@ -260,9 +260,9 @@ test_expect_success '--exists with non-commit object' '
260
261
test_expect_success '--exists with directory fails with generic error' '
262
cat >expect <<-EOF &&
263
- error: failed to look up reference: Is a directory
263
+ error: reference does not exist
264
EOF
265
- test_expect_code 1 git show-ref --exists refs/heads 2>err &&
265
+ test_expect_code 2 git show-ref --exists refs/heads 2>err &&
266
test_cmp expect err
267
'
268