[PATCH v2 11/13] for_each_reflog(): don't abort for bad references
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Jun 3, 2016, 12:33 UTC
- Message-ID
- <2ef290baec6d7114e230ca09a3c59d09e6ade9aa.1464957077.git.mhagger@alum.mit.edu>
- In-Reply-To
- <cover.1464957077.git.mhagger@alum.mit.edu>
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> --- refs/files-backend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c index cd8c7ee..e8dd9d1 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); }
-- 2.8.1