Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/hash-object.c b/hash-object.c
index 846e91a23126b747fbea8d9a8511f708c3d70e43..adfd5336a31412681415c47d2420aba8ed299ae3 100644 (file)
--- 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";