diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:43 -0700 |
| commit | a4c8352e1e13d362b2c09c94975fcd17639ff2a0 (patch) | |
| tree | ad49edad156f95d313cb67ed800faae274c769f6 /builtin/pack-objects.c | |
| parent | 92f66fd43b6968da9f14478aa9060ce85f8e3586 (diff) | |
| parent | bdbdf42f8ab79374704b769157e7b080d525b73a (diff) | |
| download | git-a4c8352e1e13d362b2c09c94975fcd17639ff2a0.tar.gz | |
Merge branch 'jk/delta-islands-progress-fix'
The codepath to compute delta islands used to spew progress output
without giving the callers any way to squelch it, which has been
fixed.
* jk/delta-islands-progress-fix:
delta-islands: respect progress flag
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index b2be8869c2..698c901523 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3134,7 +3134,7 @@ static void get_object_list(int ac, const char **av) return; if (use_delta_islands) - load_delta_islands(the_repository); + load_delta_islands(the_repository, progress); if (prepare_revision_walk(&revs)) die(_("revision walk setup failed")); |