diff options
| author | Ben Straub <bs@github.com> | 2013-10-03 06:20:20 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2013-10-03 06:20:20 -0700 |
| commit | fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc (patch) | |
| tree | 1446cb018eb05571b4eff101ceae937688e83a1d /src/pack-objects.h | |
| parent | de8fe729efd350ae5cb1ef25ffb08f92c6f706b9 (diff) | |
| parent | ab1368766240cfe861729642abe1cddd01c0203e (diff) | |
| download | libgit2-fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc.tar.gz | |
Merge branch 'development' into blame
Conflicts:
include/git2.h
Diffstat (limited to 'src/pack-objects.h')
| -rw-r--r-- | src/pack-objects.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/pack-objects.h b/src/pack-objects.h index 8e7ba7f78..0c94a5a7a 100644 --- a/src/pack-objects.h +++ b/src/pack-objects.h @@ -16,6 +16,7 @@ #include "netops.h" #include "git2/oid.h" +#include "git2/pack.h" #define GIT_PACK_WINDOW 10 /* number of objects to possibly delta against */ #define GIT_PACK_DEPTH 50 /* max delta depth */ @@ -79,6 +80,10 @@ struct git_packbuilder { int nr_threads; /* nr of threads to use */ + git_packbuilder_progress progress_cb; + void *progress_cb_payload; + double last_progress_report_time; /* the time progress was last reported */ + bool done; }; |