diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-25 14:25:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 14:25:02 -0700 |
| commit | 9bd81e4249a419f9cde8fd68e033e263533f4914 (patch) | |
| tree | 5a4c77cc648dc720e40c76e83a489ab40e70e187 /builtin-pack-objects.c | |
| parent | 450c5aed06ecf60084f993f688b549ffa377b64e (diff) | |
| parent | ef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff) | |
| download | git-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.gz | |
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-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index f43eb67016..70d2f5d416 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1760,7 +1760,7 @@ static void prepare_pack(int window, int depth) free(delta_list); } -static int git_pack_config(const char *k, const char *v) +static int git_pack_config(const char *k, const char *v, void *cb) { if(!strcmp(k, "pack.window")) { window = git_config_int(k, v); @@ -1813,7 +1813,7 @@ static int git_pack_config(const char *k, const char *v) pack_size_limit_cfg = git_config_ulong(k, v); return 0; } - return git_default_config(k, v); + return git_default_config(k, v, cb); } static void read_object_list_from_stdin(void) @@ -2033,7 +2033,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) rp_av[1] = "--objects"; /* --thin will make it --objects-edge */ rp_ac = 2; - git_config(git_pack_config); + git_config(git_pack_config, NULL); if (!pack_compression_seen && core_compression_seen) pack_compression_level = core_compression_level; |