diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-12 23:11:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-12 23:11:23 -0700 |
| commit | 1e68adc1741efa8235054fe182ba9a52b347e78e (patch) | |
| tree | a432ec1ad1eb36180de0074031c9fe25824098ac | |
| parent | Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1 (diff) | |
| parent | Ensure proper setup of git_dir for git-hash-object (diff) | |
| download | git-1e68adc1741efa8235054fe182ba9a52b347e78e.tar.gz git-1e68adc1741efa8235054fe182ba9a52b347e78e.zip | |
Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1
* en/maint-1.6.1-hash-object:
Ensure proper setup of git_dir for git-hash-object
| -rw-r--r-- | hash-object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hash-object.c b/hash-object.c index 846e91a231..adfd5336a3 100644 --- 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"; |