summaryrefslogtreecommitdiff
path: root/refs
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2016-06-18 06:15:17 +0200
committerJunio C Hamano <gitster@pobox.com>2016-06-20 11:38:20 -0700
commitd24b21e9fcaa9ed4b7966275a8d82406f578577d (patch)
treeb8f5e8f018519b6bf31dc4f0370d9ada1152559f /refs
parent4c4de89573fa29b7f97e7a9a3d0674dbdb6f2a28 (diff)
downloadgit-d24b21e9fcaa9ed4b7966275a8d82406f578577d.tar.gz
for_each_reflog(): don't abort for bad references
If there is a file under "$GIT_DIR/logs" with no corresponding reference, the old code was emitting an error message, aborting the reflog iteration, and returning -1. But * None of the callers was checking the exit value * The callers all want to find all legitimate reflogs (sometimes for the purpose of determining object reachability!) and wouldn't benefit from a truncated iteration anyway. So instead, emit an error message and skip the "broken" reflog, but continue with the iteration. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs')
-rw-r--r--refs/files-backend.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 4232da8cb7..ab40db3326 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3324,7 +3324,7 @@ static int do_for_each_reflog(struct strbuf *name, each_ref_fn fn, void *cb_data
struct object_id oid;
if (read_ref_full(name->buf, 0, oid.hash, NULL))
- retval = error("bad ref for %s", name->buf);
+ error("bad ref for %s", name->buf);
else
retval = fn(name->buf, &oid, 0, cb_data);
}