From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Mar 2009 06:11:23 +0000 (-0700)
Subject: Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1
X-Git-Tag: v1.6.2.1~1^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1e68adc1741efa8235054fe182ba9a52b347e78e?hp=532b74b2104bd00cbaa99e726e6a7b8997f48744

Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1

* en/maint-1.6.1-hash-object:
Ensure proper setup of git_dir for git-hash-object
---

diff --git a/hash-object.c b/hash-object.c
index 846e91a231..adfd5336a3 100644
--- a/hash-object.c
+++ b/hash-object.c
@@ -81,8 +81,6 @@ int main(int argc, const char **argv)
 
 	type = blob_type;
 
-	git_config(git_default_config, NULL);
-
 	argc = parse_options(argc, argv, hash_object_options, hash_object_usage, 0);
 
 	if (write_object) {
@@ -92,6 +90,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";