expire_reflog(): return early if the reference has no reflog

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 <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/reflog.c b/builtin/reflog.c
index ff51dbfc0a71bd28f0dc1ffa2e3be9dcc86bcb8e..37b33c9d70c86f28f71d4c257c0c52d8b0ba42ba 100644 (file)
--- 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),