config.c: rename label unlock_and_out

pclouds · gitster · commit 6e45b43fa9c1 · 2016-12-20T12:08:06.000-08:00
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 &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -2329,7 +2329,7 @@ int git_config_rename_section_in_file(const char *config_filename,`
`2329`	`2329`
`2330`	`2330`	`if (!(config_file = fopen(config_filename, "rb"))) {`
`2331`	`2331`	`/* no config file means nothing to rename, no error */`
`2332`		`- goto unlock_and_out;`
	`2332`	`+ goto commit_and_out;`
`2333`	`2333`	`}`
`2334`	`2334`
`2335`	`2335`	`if (fstat(fileno(config_file), &st) == -1) {`
`@@ -2391,7 +2391,7 @@ int git_config_rename_section_in_file(const char *config_filename,`
`2391`	`2391`	`}`
`2392`	`2392`	`}`
`2393`	`2393`	`fclose(config_file);`
`2394`		`-unlock_and_out:`
	`2394`	`+commit_and_out:`
`2395`	`2395`	`if (commit_lock_file(lock) < 0)`
`2396`	`2396`	`ret = error_errno("could not write config file %s",`
`2397`	`2397`	`config_filename);`