summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-06-21 21:22:20 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-06-22 11:12:34 -0700
commit40e7629194c79e72009b5b8e98cce65921b0faf2 (patch)
tree3c08dd4ad14c2aac2ed4627badca17cb42629e07
parentarchive: reorder option parsing and config reading (diff)
downloadtgif-40e7629194c79e72009b5b8e98cce65921b0faf2.tar.xz
archive-tar: don't reload default config options
We load our own tar-specific config, and then chain to git_default_config. This is pointless, as our caller should already have loaded the default config. It also introduces a needless inconsistency with the zip archiver, which does not look at the config files at all (and therefore relies on the caller to have loaded config). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--archive-tar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/archive-tar.c b/archive-tar.c
index cee06ce3cb..1ab1a2caf5 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -231,7 +231,7 @@ static int git_tar_config(const char *var, const char *value, void *cb)
}
return 0;
}
- return git_default_config(var, value, cb);
+ return 0;
}
int write_tar_archive(struct archiver_args *args)