From: Stefan Beller Date: Fri, 12 Dec 2014 18:15:14 GMT Subject: Re: [PATCH v2 06/24] expire_reflog(): return early if the reference has no reflog Message-ID: In-Reply-To: <1418374623-5566-7-git-send-email-mhagger@alum.mit.edu> On Fri, Dec 12, 2014 at 12:56 AM, Michael Haggerty wrote: > There is very little cleanup needed if the reference has no reflog. If > we move the initialization of log_file down a bit, there's even less. > So instead of jumping to the cleanup code at the end of the function, > just do the cleanup and return inline. > > Signed-off-by: Michael Haggerty > Reviewed-by: Jonathan Nieder Reviewed-by: Stefan Beller > --- > builtin/reflog.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/builtin/reflog.c b/builtin/reflog.c > index ff51dbf..37b33c9 100644 > --- a/builtin/reflog.c > +++ b/builtin/reflog.c > @@ -368,9 +368,11 @@ static int expire_reflog(const char *refname, const unsigned char *sha1, > lock = lock_any_ref_for_update(refname, sha1, 0, NULL); > if (!lock) > return error("cannot lock ref '%s'", refname); > + if (!reflog_exists(refname)) { > + unlock_ref(lock); > + return 0; > + } > log_file = git_pathdup("logs/%s", refname); > - if (!reflog_exists(refname)) > - goto finish; > if (!cmd->dry_run) { > newlog_path = git_pathdup("logs/%s.lock", refname); > cb.newlog = fopen(newlog_path, "w"); > @@ -419,7 +421,7 @@ static int expire_reflog(const char *refname, const unsigned char *sha1, > clear_commit_marks(tip_commit, REACHABLE); > } > } > - finish: > + > if (cb.newlog) { > if (fclose(cb.newlog)) { > status |= error("%s: %s", strerror(errno), > -- > 2.1.3 >