From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sat, 16 Oct 2021 09:39:19 +0000 (+0200)
Subject: refs API: ignore errno in worktree.c's find_shared_symref()
X-Git-Tag: v2.35.0-rc0~135^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0506eb71f7b64dac71ae35fafa7ca23c7a41e276;p=thirdparty%2Fgit.git

refs API: ignore errno in worktree.c's find_shared_symref()

There are only handful of callers of find_shared_symref(), none of
whom care about errno, so let's migrate to the non-errno-propagating
version of refs_resolve_ref_unsafe() and explicitly ignore errno here.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/worktree.c b/worktree.c
index fa988ee978..7d7cf05815 100644
--- a/worktree.c
+++ b/worktree.c
@@ -420,6 +420,7 @@ const struct worktree *find_shared_symref(const char *symref,
 		const char *symref_target;
 		struct ref_store *refs;
 		int flags;
+		int ignore_errno;
 
 		if (wt->is_bare)
 			continue;
@@ -436,8 +437,9 @@ const struct worktree *find_shared_symref(const char *symref,
 		}
 
 		refs = get_worktree_ref_store(wt);
-		symref_target = refs_resolve_ref_unsafe(refs, symref, 0,
-							NULL, &flags);
+		symref_target = refs_werrres_ref_unsafe(refs, symref, 0,
+							NULL, &flags,
+							&ignore_errno);
 		if ((flags & REF_ISSYMREF) &&
 		    symref_target && !strcmp(symref_target, target)) {
 			existing = wt;