diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-25 21:25:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 21:25:02 (GMT) |
| commit | 9bd81e4249a419f9cde8fd68e033e263533f4914 (patch) | |
| tree | 5a4c77cc648dc720e40c76e83a489ab40e70e187 /hash-object.c | |
| parent | 450c5aed06ecf60084f993f688b549ffa377b64e (diff) | |
| parent | ef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff) | |
| download | git-9bd81e4249a419f9cde8fd68e033e263533f4914.zip git-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.gz git-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.bz2 | |
Merge branch 'js/config-cb'v1.5.6-rc0
* js/config-cb:
Provide git_config with a callback-data parameter
Conflicts:
builtin-add.c
builtin-cat-file.c
Diffstat (limited to 'hash-object.c')
| -rw-r--r-- | hash-object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hash-object.c b/hash-object.c index 0a7ac2f..48d5223 100644 --- a/hash-object.c +++ b/hash-object.c @@ -65,7 +65,7 @@ int main(int argc, char **argv) int hashstdin = 0; int stdin_paths = 0; - git_config(git_default_config); + git_config(git_default_config, NULL); for (i = 1 ; i < argc; i++) { if (!no_more_flags && argv[i][0] == '-') { |