mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/maint-hash-object'

Browse Source 
* en/maint-hash-object:
  Ensure proper setup of git_dir for git-hash-object

Conflicts:
	hash-object.c
This commit is contained in:
Junio C Hamano
2009-03-05 15:58:42 -08:00
parent e46f778968 272459a3b8
commit 8cc3fe45c9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hash-object.c
View File

@ -84,8 +84,6 @@ int main(int argc, const char **argv)
git_extract_argv0_path(argv[0]); git_extract_argv0_path(argv[0]);
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, hash_object_options, hash_object_usage, 0); argc = parse_options(argc, argv, hash_object_options, hash_object_usage, 0);
if (write_object) { if (write_object) {
@ -95,6 +93,8 @@ int main(int argc, const char **argv)
vpath = prefix_filename(prefix, prefix_length, vpath); vpath = prefix_filename(prefix, prefix_length, vpath);
} }
git_config(git_default_config, NULL);
if (stdin_paths) { if (stdin_paths) {
if (hashstdin) if (hashstdin)
errstr = "Can't use --stdin-paths with --stdin"; errstr = "Can't use --stdin-paths with --stdin";