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 <mhag...@alum.mit.edu>
---
config.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/config.c b/config.c
index a191328..24f0abb 100644
--- a/config.c
+++ b/config.c
@@ -1964,17 +1964,17 @@ 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;
- goto out_free;
- }
+ } else
+ ret = 0;
/*
- * lock is committed, so don't try to roll it back below.
- * NOTE: Since lockfile.c keeps a linked list of all created
- * lock_file structures, it isn't safe to free(lock). It's
- * better to just leave it hanging around.
+ * lock is committed or rolled back now, so there is no need
+ * to roll it back below. NOTE: Since lockfile.c keeps a
+ * linked list of all created lock_file structures, it isn't
+ * safe to free(lock). We have to just leave it hanging
+ * around.
*/
lock = NULL;
- ret = 0;
/* Invalidate the config cache */
git_config_clear();
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
