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.lorimer.id.au/gitweb.git/diff_plain/8cc3fe45c92a2e85400a6ee83c3b3a4a8ca1d6c7?ds=inline;hp=-c

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 --combined hash-object.c
index 37e66779ab,adfd5336a3..ebb3bedb07
--- a/hash-object.c
+++ b/hash-object.c
@@@ -8,7 -8,6 +8,7 @@@
  #include "blob.h"
  #include "quote.h"
  #include "parse-options.h"
 +#include "exec_cmd.h"
  
  static void hash_fd(int fd, const char *type, int write_object, const char *path)
  {
@@@ -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) {
@@@ -95,6 -90,8 +93,8 @@@
  			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";