From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Wed, 1 Oct 2014 10:28:26 +0000 (+0200)
Subject: git_config_set_multivar_in_file(): avoid call to rollback_lock_file()
X-Git-Tag: v2.2.0-rc0~53^2~16
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=e831855ecc6783bfe4b681017349c623fc2fe8c8;p=git.git

git_config_set_multivar_in_file(): avoid call to rollback_lock_file()

After commit_lock_file() is called, then the lock_file object is
necessarily either committed or rolled back.  So there is no need to
call rollback_lock_file() again in either of these cases.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/config.c b/config.c
index a677eb6c59..123ed29963 100644
--- a/config.c
+++ b/config.c
@@ -2083,6 +2083,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
 	if (commit_lock_file(lock) < 0) {
 		error("could not commit config file %s", config_filename);
 		ret = CONFIG_NO_WRITE;
+		lock = NULL;
 		goto out_free;
 	}