summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-01-14 23:25:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-01-14 23:25:15 (GMT)
commit31e391236958c2e75787b7579146b3569fb6ec17 (patch)
tree16e512db09a8a8cfad7ecea1d9c2e482fff88144
parent1ffcbaa1a5f10c9f706314d77f88de20a4a498c2 (diff)
parentcac15b3fb422efb2cd1572cc654793d5df5fa434 (diff)
downloadgit-31e391236958c2e75787b7579146b3569fb6ec17.zip
git-31e391236958c2e75787b7579146b3569fb6ec17.tar.gz
git-31e391236958c2e75787b7579146b3569fb6ec17.tar.bz2
Merge branch 'ab/refs-errno-cleanup'
A brown-paper-bag fix on top of a topic that was merged during this cycle. * ab/refs-errno-cleanup: refs API: use "failure_errno", not "errno"
-rw-r--r--refs.c2
-rw-r--r--refs/files-backend.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/refs.c b/refs.c
index bd2546a..addb262 100644
--- a/refs.c
+++ b/refs.c
@@ -1722,8 +1722,6 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
if (refs_read_raw_ref(refs, refname, oid, &sb_refname,
&read_flags, failure_errno)) {
*flags |= read_flags;
- if (errno)
- *failure_errno = errno;
/* In reading mode, refs must eventually resolve */
if (resolve_flags & RESOLVE_REF_READING)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index b529fdf..43a3b88 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -382,7 +382,6 @@ stat_ref:
if (lstat(path, &st) < 0) {
int ignore_errno;
myerr = errno;
- errno = 0;
if (myerr != ENOENT)
goto out;
if (refs_read_raw_ref(refs->packed_ref_store, refname, oid,
@@ -399,7 +398,6 @@ stat_ref:
strbuf_reset(&sb_contents);
if (strbuf_readlink(&sb_contents, path, st.st_size) < 0) {
myerr = errno;
- errno = 0;
if (myerr == ENOENT || myerr == EINVAL)
/* inconsistent with lstat; retry */
goto stat_ref;
@@ -469,6 +467,7 @@ out:
strbuf_release(&sb_path);
strbuf_release(&sb_contents);
+ errno = 0;
return ret;
}