OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e46f778
272459a
)
Merge branch 'en/maint-hash-object'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 5 Mar 2009 23:58:42 +0000
(15:58 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 5 Mar 2009 23:58:42 +0000
(15:58 -0800)
* en/maint-hash-object:
Ensure proper setup of git_dir for git-hash-object
Conflicts:
hash-object.c
1
2
hash-object.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
hash-object.c
index
37e6677
,
adfd533
..
ebb3bed
---
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) {