summaryrefslogtreecommitdiff
path: root/hash-object.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-11 13:51:59 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-11 13:51:59 -0700
commitbbc6a14b723ae831f35fc1b923fe497e7329443e (patch)
treefcc4adb16eb4b46acc810c3975dcb298cedea517 /hash-object.c
parent9a6682bab5e800465f0a4e44cdf18fe396ff4f6d (diff)
parent272459a3b809db19d15131eb5df9dfe939af9c8c (diff)
downloadgit-bbc6a14b723ae831f35fc1b923fe497e7329443e.tar.gz
Merge branch 'en/maint-hash-object' into maint
* en/maint-hash-object: Ensure proper setup of git_dir for git-hash-object Conflicts: hash-object.c
Diffstat (limited to 'hash-object.c')
-rw-r--r--hash-object.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hash-object.c b/hash-object.c
index 37e66779ab..ebb3bedb07 100644
--- a/hash-object.c
+++ b/hash-object.c
@@ -84,8 +84,6 @@ int main(int argc, const char **argv)
git_extract_argv0_path(argv[0]);
- git_config(git_default_config, NULL);
-
argc = parse_options(argc, argv, hash_object_options, hash_object_usage, 0);
if (write_object) {
@@ -95,6 +93,8 @@ int main(int argc, const char **argv)
vpath = prefix_filename(prefix, prefix_length, vpath);
}
+ git_config(git_default_config, NULL);
+
if (stdin_paths) {
if (hashstdin)
errstr = "Can't use --stdin-paths with --stdin";