diff options
| author | lmcglash <lmcglash@mathworks.com> | 2023-03-10 08:51:43 +0000 |
|---|---|---|
| committer | lmcglash <lmcglash@mathworks.com> | 2023-03-10 08:51:43 +0000 |
| commit | 570ef74a07f80d8890a2bf0125d72ee42f83187e (patch) | |
| tree | c3106ddd08967e3f071f1eec872a1d6db01dec37 /src/libgit2/pack-objects.c | |
| parent | a9793ac643a0cd82b00970d0d6e0b67681ec3112 (diff) | |
| parent | d066d0d95c43e97df6624292f3f527f9372ca8fe (diff) | |
| download | libgit2-570ef74a07f80d8890a2bf0125d72ee42f83187e.tar.gz | |
Merge commit 'd066d0d95c43e97df6624292f3f527f9372ca8fe'
Diffstat (limited to 'src/libgit2/pack-objects.c')
| -rw-r--r-- | src/libgit2/pack-objects.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/libgit2/pack-objects.c b/src/libgit2/pack-objects.c index 068231649..20a5dfcbd 100644 --- a/src/libgit2/pack-objects.c +++ b/src/libgit2/pack-objects.c @@ -1407,7 +1407,18 @@ int git_packbuilder_write( opts.progress_cb = progress_cb; opts.progress_cb_payload = progress_cb_payload; - if ((error = git_indexer_new(&indexer, path, mode, pb->odb, &opts)) < 0) + /* TODO: SHA256 */ + +#ifdef GIT_EXPERIMENTAL_SHA256 + opts.mode = mode; + opts.odb = pb->odb; + + error = git_indexer_new(&indexer, path, GIT_OID_SHA1, &opts); +#else + error = git_indexer_new(&indexer, path, mode, pb->odb, &opts); +#endif + + if (error < 0) goto cleanup; if (!git_repository__configmap_lookup(&t, pb->repo, GIT_CONFIGMAP_FSYNCOBJECTFILES) && t) |