summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-07-22 20:58:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-07-22 20:58:46 (GMT)
commited16d0dbf11128e1f92b39a373a83442fa6d5051 (patch)
treeec11c9895bce0bc27018d55baf4d3f5fd5bd17c4 /config.c
parentd79bcd68056250d7c03bf9b12728ee2fd85a0ab3 (diff)
parentb421812b487da44b01773ef38789db1122bec61a (diff)
downloadgit-ed16d0dbf11128e1f92b39a373a83442fa6d5051.zip
git-ed16d0dbf11128e1f92b39a373a83442fa6d5051.tar.gz
git-ed16d0dbf11128e1f92b39a373a83442fa6d5051.tar.bz2
Merge branch 'maint'
* maint: doc/fast-import: clarify notemodify command Documentation: minor grammatical fix in rev-list-options.txt Documentation: git-filter-branch honors replacement refs remote-curl: Add a format check to parsing of info/refs git-config: Remove extra whitespaces
Diffstat (limited to 'config.c')
-rw-r--r--config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.c b/config.c
index 6b61a84..e42c59b 100644
--- a/config.c
+++ b/config.c
@@ -1499,10 +1499,10 @@ int git_config_rename_section(const char *old_name, const char *new_name)
}
}
fclose(config_file);
- unlock_and_out:
+unlock_and_out:
if (commit_lock_file(lock) < 0)
ret = error("could not commit config file %s", config_filename);
- out:
+out:
free(config_filename);
return ret;
}