diff options
| author | Vicent Martà <vicent@github.com> | 2012-11-13 14:13:47 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2012-11-13 14:13:47 -0800 |
| commit | aa1c3b588edae7c6d718e85bce54d990c69cd535 (patch) | |
| tree | 3004114ad897d7c8070f9c588feb96af86d0261f /src/pack-objects.c | |
| parent | 262274748f1c3cb6de4fa621100033eda6984166 (diff) | |
| parent | 757b406504021b3a73e52ce9f95d590d65c7dce5 (diff) | |
| download | libgit2-aa1c3b588edae7c6d718e85bce54d990c69cd535.tar.gz | |
Merge pull request #1016 from arrbee/fix-checkout-dir-removal
Update checkout with new strategies & behavior
Diffstat (limited to 'src/pack-objects.c')
| -rw-r--r-- | src/pack-objects.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pack-objects.c b/src/pack-objects.c index f75267629..a146dc048 100644 --- a/src/pack-objects.c +++ b/src/pack-objects.c @@ -73,16 +73,16 @@ static int packbuilder_config(git_packbuilder *pb) { git_config *config; int ret; + int64_t val; if (git_repository_config__weakptr(&config, pb->repo) < 0) return -1; -#define config_get(key, dst, default) \ - ret = git_config_get_int64((int64_t *)&dst, config, key); \ - if (ret == GIT_ENOTFOUND) \ - dst = default; \ - else if (ret < 0) \ - return -1; +#define config_get(KEY,DST,DFLT) do { \ + ret = git_config_get_int64(&val, config, KEY); \ + if (!ret) (DST) = val; \ + else if (ret == GIT_ENOTFOUND) (DST) = (DFLT); \ + else if (ret < 0) return -1; } while (0) config_get("pack.deltaCacheSize", pb->max_delta_cache_size, GIT_PACK_DELTA_CACHE_SIZE); |