[PATCH 12/20] refs API: ignore errno in worktree.c's find_shared_symref()
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Oct 14, 2021, 00:06 UTC
- Message-ID
- <patch-12.20-8d87db98041-20211013T235900Z-avarab@gmail.com>
- In-Reply-To
- <cover-00.20-00000000000-20211013T235900Z-avarab@gmail.com>
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> --- worktree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/worktree.c b/worktree.c index fa988ee978f..7d7cf058154 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;
-- 2.33.1.1346.g48288c3c089