Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
config.c: rename label unlock_and_out
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Tue, 20 Dec 2016 09:48:35 +0000
(16:48 +0700)
committer
Junio 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
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
29647d7
)
diff --git
a/config.c
b/config.c
index 19ceb2639ea236c660e215020ec99873eecea2c4..8065296a116e6402f061a60b006526b77330119f 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);