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 /builtin-update-ref.c | |
| parent | 450c5aed06ecf60084f993f688b549ffa377b64e (diff) | |
| parent | ef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff) | |
| download | git-1.5.6-rc0.zip git-1.5.6-rc0.tar.gz git-1.5.6-rc0.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 'builtin-update-ref.c')
| -rw-r--r-- | builtin-update-ref.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-update-ref.c b/builtin-update-ref.c index e90737c..93c1271 100644 --- a/builtin-update-ref.c +++ b/builtin-update-ref.c @@ -22,7 +22,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) OPT_END(), }; - git_config(git_default_config); + git_config(git_default_config, NULL); argc = parse_options(argc, argv, options, git_update_ref_usage, 0); if (msg && !*msg) die("Refusing to perform update with empty message."); |