From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2009 23:58:42 +0000 (-0800)
Subject: Merge branch 'en/maint-hash-object'
X-Git-Tag: v1.6.3-rc0~201
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8cc3fe45c92a2e85400a6ee83c3b3a4a8ca1d6c7;p=git.git

Merge branch 'en/maint-hash-object'

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

Conflicts:
	hash-object.c
---

8cc3fe45c92a2e85400a6ee83c3b3a4a8ca1d6c7
diff --cc hash-object.c
index 37e66779a,adfd5336a..ebb3bedb0
--- 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) {