summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-14 21:20:41 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-14 21:20:41 (GMT)
commit5faaf24634a4d3a630bd3655cc85fa96f8bc1903 (patch)
treee7efe165e0da77d5dc25a1c4867f7cb11572d6c1 /config.c
parentbd07326dcd46196c14be81c68800ce2d1f4144c4 (diff)
downloadgit-5faaf24634a4d3a630bd3655cc85fa96f8bc1903.zip
git-5faaf24634a4d3a630bd3655cc85fa96f8bc1903.tar.gz
git-5faaf24634a4d3a630bd3655cc85fa96f8bc1903.tar.bz2
Make sure packedgitwindowsize is multiple of (pagesize * 2)
The next patch depends on this. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'config.c')
-rw-r--r--config.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/config.c b/config.c
index d821071..c938aa0 100644
--- a/config.c
+++ b/config.c
@@ -310,12 +310,14 @@ int git_default_config(const char *var, const char *value)
}
if (!strcmp(var, "core.packedgitwindowsize")) {
- int pgsz = getpagesize();
+ int pgsz_x2 = getpagesize() * 2;
packed_git_window_size = git_config_int(var, value);
- packed_git_window_size /= pgsz;
- if (packed_git_window_size < 2)
- packed_git_window_size = 2;
- packed_git_window_size *= pgsz;
+
+ /* This value must be multiple of (pagesize * 2) */
+ packed_git_window_size /= pgsz_x2;
+ if (packed_git_window_size < 1)
+ packed_git_window_size = 1;
+ packed_git_window_size *= pgsz_x2;
return 0;
}