OSDN Git Service

config.c: rename label unlock_and_out
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Tue, 20 Dec 2016 09:48:35 +0000 (16:48 +0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2016 20:08:06 +0000 (12:08 -0800)
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>
config.c

index 19ceb26..8065296 100644 (file)
--- 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);