Merge branch 'jc/cherry-pick' (early part)

diff --git a/builtin-checkout.c b/builtin-checkout.c
index b0cd78856418319ed46b2e0cf372deffc050bb80..6b08016228d4d50cfd6863a11f33b2c13084a6eb 100644 (file)
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -484,11 +484,6 @@ static int switch_branches(struct checkout_opts *opts, struct branch_info *new)
        return post_checkout_hook(old.commit, new->commit, 1);
 }
 
-static int git_checkout_config(const char *var, const char *value)
-{
-       return git_default_config(var, value);
-}
-
 int cmd_checkout(int argc, const char **argv, const char *prefix)
 {
        struct checkout_opts opts;
@@ -510,7 +505,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
        memset(&opts, 0, sizeof(opts));
        memset(&new, 0, sizeof(new));
 
-       git_config(git_checkout_config);
+       git_config(git_default_config);
 
        opts.track = git_branch_track;