summaryrefslogtreecommitdiff
path: root/builtin/remote.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2016-02-22 11:23:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-22 18:23:55 (GMT)
commit30598ad06f2adfef1f74d6348677358865cbf373 (patch)
tree26384fa5cdedcc280625f416f899086c5ac5823d /builtin/remote.c
parent2f29c1bf34ec12c24072bb54a2c009bd1f17a2ee (diff)
downloadgit-30598ad06f2adfef1f74d6348677358865cbf373.zip
git-30598ad06f2adfef1f74d6348677358865cbf373.tar.gz
git-30598ad06f2adfef1f74d6348677358865cbf373.tar.bz2
config: rename git_config_set to git_config_set_gently
The desired default behavior for `git_config_set` is to die whenever an error occurs. Dying is the default for a lot of internal functions when failures occur and is in this case the right thing to do for most callers as otherwise we might run into inconsistent repositories without noticing. As some code may rely on the actual return values for `git_config_set` we still require the ability to invoke these functions without aborting. Rename the existing `git_config_set` functions to `git_config_set_gently` to keep them available for those callers. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/remote.c')
-rw-r--r--builtin/remote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index dee6551..6cacbca 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1393,7 +1393,7 @@ static int update(int argc, const char **argv)
static int remove_all_fetch_refspecs(const char *remote, const char *key)
{
- return git_config_set_multivar(key, NULL, NULL, 1);
+ return git_config_set_multivar_gently(key, NULL, NULL, 1);
}
static void add_branches(struct remote *remote, const char **branches,