summaryrefslogtreecommitdiffstats
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-29 21:47:55 +0100
committerJunio C Hamano <gitster@pobox.com>2019-01-29 21:47:55 +0100
commit424a6658a7472f746ec97c7818605a4f208db63f (patch)
tree9cf459dc1da637a20df57e71084d839f018e9ba3 /remote.c
parentMerge branch 'ms/http-no-more-failonerror' (diff)
parentremote: check config validity before creating rewrite struct (diff)
downloadgit-424a6658a7472f746ec97c7818605a4f208db63f.tar.xz
git-424a6658a7472f746ec97c7818605a4f208db63f.zip
Merge branch 'jk/remote-insteadof-cleanup'
Code clean-up. * jk/remote-insteadof-cleanup: remote: check config validity before creating rewrite struct
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/remote.c b/remote.c
index 670dd44813..9cc3b07d21 100644
--- a/remote.c
+++ b/remote.c
@@ -337,14 +337,14 @@ static int handle_config(const char *key, const char *value, void *cb)
if (!name)
return 0;
if (!strcmp(subkey, "insteadof")) {
- rewrite = make_rewrite(&rewrites, name, namelen);
if (!value)
return config_error_nonbool(key);
+ rewrite = make_rewrite(&rewrites, name, namelen);
add_instead_of(rewrite, xstrdup(value));
} else if (!strcmp(subkey, "pushinsteadof")) {
- rewrite = make_rewrite(&rewrites_push, name, namelen);
if (!value)
return config_error_nonbool(key);
+ rewrite = make_rewrite(&rewrites_push, name, namelen);
add_instead_of(rewrite, xstrdup(value));
}
}