rollback_lock_file(): do not clear filename redundantly

It is only necessary to clear the lock_file's filename field if it was
not already clear.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Ronnie Sahlberg <sahlberg@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/lockfile.c b/lockfile.c
index d02c3bf901560d1e2bb021b23de7aae24bb45c0d..5330d6ae52ad6693c77fa31d24a51f7448597d34 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -280,6 +280,6 @@ void rollback_lock_file(struct lock_file *lk)
                if (lk->fd >= 0)
                        close(lk->fd);
                unlink_or_warn(lk->filename);
+               lk->filename[0] = 0;
        }
-       lk->filename[0] = 0;
 }