mirror of
https://github.com/git/git.git
synced 2024-10-20 06:28:20 +02:00
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
This commit is contained in:
commit
1e68adc174
@ -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";
|
||||
|
Loading…
Reference in New Issue
Block a user