diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:38:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:38:19 (GMT) |
| commit | e59150199c063726d6613bf7b86d4c4dd8dfc1e6 (patch) | |
| tree | ce4fd7c2471f3dff436ef03cf022922c9fe93b48 /builtin | |
| parent | 3e06e74e4cc221d0b602622a5a8d472cfa3efa2d (diff) | |
| parent | bdbdf42f8ab79374704b769157e7b080d525b73a (diff) | |
| download | git-e59150199c063726d6613bf7b86d4c4dd8dfc1e6.zip git-e59150199c063726d6613bf7b86d4c4dd8dfc1e6.tar.gz git-e59150199c063726d6613bf7b86d4c4dd8dfc1e6.tar.bz2 | |
Merge branch 'jk/delta-islands-progress-fix' into maint
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')
| -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 41d7fc5..787ae10 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")); |