Re: [PATCH] Add --no-reuse-delta, --window, and --depth options to
From: Nicolas Pitre <hidden>
Date: 2016-06-15 22:43:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] Add --no-reuse-delta, --window, and --depth options to · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Add --no-reuse-delta, --window, and --depth options to · Nicolas Pitre <hidden>
On Tue, 8 May 2007, Theodore Ts'o wrote:
OK, here's a patch to implement pack.depth (with the default tweaked to 50 --- is that too high?),
This is most likely to affect runtime performances, but some benchmarks would be needed to find out how much. Having both pack.depth and pack.window as config options (with current defaults of 10) would certainly be a good thing. Tweaking those defaults should probably be investigated separately.
followed by a simplified and reworked patch to git-gc that only implements --no-reuse-delta. I don't imagine that most users will want to use that feature most of the time, hence the long option name, but occasionally, it might be useful. Yes, the user could just run "git-repack -a -d -f -l" after running git-gc, but then the "git-repack -a -d -l" in git-gc is just a wasted disk i/o.
In which case, it is git-gc that needs to get a bit smarter. Maybe something like this: ----- >* Avoid running git-repack from git-gc if there is evidently nothing to repack. Signed-off-by: Nicolas Pitre <redacted> ---
diff --git a/builtin-count-objects.c b/builtin-count-objects.c
index ff90ebd..8d79764 100644
--- a/builtin-count-objects.c
+++ b/builtin-count-objects.c@@ -67,13 +67,40 @@ static void count_objects(DIR *d, char *path, int len, int verbose, } } -int cmd_count_objects(int ac, const char **av, const char *prefix) +static void count_loose_objects(int verbose, + unsigned long *loose, + unsigned long *loose_size, + unsigned long *packed_loose, + unsigned long *garbage) { - int i; - int verbose = 0; const char *objdir = get_object_directory(); - int len = strlen(objdir); + int i, len = strlen(objdir); char *path = xmalloc(len + 50); + memcpy(path, objdir, len); + if (len && objdir[len-1] != '/') + path[len++] = '/'; + for (i = 0; i < 256; i++) { + DIR *d; + sprintf(path + len, "%02x", i); + d = opendir(path); + if (!d) + continue; + count_objects(d, path, len, verbose, + loose, loose_size, packed_loose, garbage); + closedir(d); + } +} + +unsigned long num_loose_objects(void) +{ + unsigned long loose = 0, packed_loose = 0, garbage = 0, loose_size = 0; + count_loose_objects(0, &loose, &loose_size, &packed_loose, &garbage); + return loose; +} + +int cmd_count_objects(int ac, const char **av, const char *prefix) +{ + int i, verbose = 0; unsigned long loose = 0, packed = 0, packed_loose = 0, garbage = 0; unsigned long loose_size = 0;
@@ -90,19 +117,8 @@ int cmd_count_objects(int ac, const char **av, const char *prefix) /* we do not take arguments other than flags for now */ if (i < ac) usage(count_objects_usage); - memcpy(path, objdir, len); - if (len && objdir[len-1] != '/') - path[len++] = '/'; - for (i = 0; i < 256; i++) { - DIR *d; - sprintf(path + len, "%02x", i); - d = opendir(path); - if (!d) - continue; - count_objects(d, path, len, verbose, - &loose, &loose_size, &packed_loose, &garbage); - closedir(d); - } + + count_loose_objects(verbose, &loose, &loose_size, &packed_loose, &garbage); if (verbose) { struct packed_git *p; unsigned long num_pack = 0;
diff --git a/builtin-gc.c b/builtin-gc.c
index 3b1f8c2..b9b3c05 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c@@ -40,7 +40,7 @@ static int gc_config(const char *var, const char *value) int cmd_gc(int argc, const char **argv, const char *prefix) { int i; - int prune = 0; + int prune = 0, do_repack = 0; git_config(gc_config);
@@ -65,7 +65,20 @@ int cmd_gc(int argc, const char **argv, const char *prefix) if (run_command_v_opt(argv_reflog, RUN_GIT_CMD)) return error(FAILED_RUN, argv_reflog[0]); - if (run_command_v_opt(argv_repack, RUN_GIT_CMD)) + if (num_loose_objects() > 0) { + do_repack = 1; + } else { + struct packed_git *p; + unsigned long num_pack = 0; + if (!packed_git) + prepare_packed_git(); + for (p = packed_git; p; p = p->next) + if (p->pack_local) + num_pack++; + if (num_pack > 1) + do_repack = 1; + } + if (do_repack && run_command_v_opt(argv_repack, RUN_GIT_CMD)) return error(FAILED_RUN, argv_repack[0]); if (prune && run_command_v_opt(argv_prune, RUN_GIT_CMD))
diff --git a/cache.h b/cache.h
index 8e76152..3a140f1 100644
--- a/cache.h
+++ b/cache.h@@ -359,6 +359,8 @@ extern int legacy_loose_object(unsigned char *); extern int has_pack_file(const unsigned char *sha1); extern int has_pack_index(const unsigned char *sha1); +extern unsigned long num_loose_objects(void); + extern signed char hexval_table[256]; static inline unsigned int hexval(unsigned int c) {