From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Tue, 20 Dec 2016 09:48:35 +0000 (+0700)
Subject: config.c: rename label unlock_and_out
X-Git-Tag: v2.11.1~15^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6e45b43fa9c17124c5aea03b3fd6563cf03bae07;p=git-core%2Fgit.git

config.c: rename label unlock_and_out

There are two ways to unlock a file: commit, or revert. Rename it to
commit_and_out to avoid confusion.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/config.c b/config.c
index 19ceb2639..8065296a1 100644
--- a/config.c
+++ b/config.c
@@ -2329,7 +2329,7 @@ int git_config_rename_section_in_file(const char *config_filename,
 
 	if (!(config_file = fopen(config_filename, "rb"))) {
 		/* no config file means nothing to rename, no error */
-		goto unlock_and_out;
+		goto commit_and_out;
 	}
 
 	if (fstat(fileno(config_file), &st) == -1) {
@@ -2391,7 +2391,7 @@ int git_config_rename_section_in_file(const char *config_filename,
 		}
 	}
 	fclose(config_file);
-unlock_and_out:
+commit_and_out:
 	if (commit_lock_file(lock) < 0)
 		ret = error_errno("could not write config file %s",
 				  config_filename);