From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Mar 2009 20:51:59 +0000 (-0700)
Subject: Merge branch 'en/maint-hash-object' into maint
X-Git-Tag: v1.6.2.1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbc6a14b723ae831f35fc1b923fe497e7329443e;p=thirdparty%2Fgit.git

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
---

bbc6a14b723ae831f35fc1b923fe497e7329443e
diff --cc hash-object.c
index 37e66779ab,adfd5336a3..ebb3bedb07
--- a/hash-object.c
+++ b/hash-object.c
@@@ -82,10 -81,6 +82,8 @@@ int main(int argc, const char **argv
  
  	type = blob_type;
  
 +	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) {