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

diff --cc hash-object.c
index 37e66779ab9e14dbe5b5416d0e19b04d7f122d52,adfd5336a31412681415c47d2420aba8ed299ae3..ebb3bedb074202a29e2356845012bd1ffae0dc19
--- 1/hash-object.c
--- 2/hash-object.c
+++ b/hash-object.c
@@@ -82,10 -81,6 +82,8 @@@ int main(int argc, const char **argv
  
        type = blob_type;
  
-       git_config(git_default_config, NULL);
- 
 +      git_extract_argv0_path(argv[0]);
 +
        argc = parse_options(argc, argv, hash_object_options, hash_object_usage, 0);
  
        if (write_object) {