diff options
| author | Jacques Germishuys <jacques.germishuys@gmail.com> | 2019-11-28 17:21:07 +0100 |
|---|---|---|
| committer | gregor herrmann <gregoa@debian.org> | 2019-11-28 17:21:07 +0100 |
| commit | dec9cc1db001c6680593895fd44ff12398c2ea73 (patch) | |
| tree | 75e84448a2a18c1ae3a2172117e61c8b33405f68 | |
| parent | 46ade6edd3dcce040059fb14fc099909d8ee506c (diff) | |
Fix build and test issues with libgit2 0.28archive/debian/0.79-7
Origin: https://github.com/jacquesg/p5-Git-Raw/ , commits 30f7a44, 3187517, ad158b8
Bug-Debian: https://bugs.debian.org/931695
Forwarded: not-needed
Reviewed-by: gregor herrmann <gregoa@debian.org>
Last-Update: 2019-11-28
Gbp-Pq: Name libgit2-0.28.patch
| -rw-r--r-- | t/13-checkout.t | 1 | ||||
| -rw-r--r-- | t/15-merge.t | 5 | ||||
| -rw-r--r-- | xs/Indexer.xs | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/t/13-checkout.t b/t/13-checkout.t index 1d85c8bc..0662ed9a 100644 --- a/t/13-checkout.t +++ b/t/13-checkout.t @@ -16,6 +16,7 @@ $repo -> checkout($fst, { 'ancestor_label' => 'ancestor', 'our_label' => 'ours', 'their_label' => 'theirs', + 'checkout_strategy' => { 'none' => 1 } }); is_deeply $repo -> status({}) -> {'test3/under/the/tree/test3'}, undef; diff --git a/t/15-merge.t b/t/15-merge.t index b14f6481..46942dca 100644 --- a/t/15-merge.t +++ b/t/15-merge.t @@ -69,6 +69,7 @@ is $master -> target -> id, $repo -> merge_base("refs/heads/master", substr($com is $master -> target -> id, $repo -> merge_base($master, $commit1) -> id; is $master -> target -> id, $repo -> merge_base($master, 'refs/heads/branch1') -> id; +$branch1 = Git::Raw::Branch -> lookup($repo, 'branch1', 1); my $r = $repo -> merge_analysis($branch1); is_deeply $r, ['normal', 'fast_forward']; @@ -132,7 +133,8 @@ $repo -> checkout($repo -> head($master), { is $branch2 -> target -> id, $repo -> merge_base($branch2, $commit2) -> id; is $commit -> id, $repo -> merge_base($commit1, $commit2) -> id; -$r = $repo ->merge_analysis($branch2); +$branch2 = Git::Raw::Branch -> lookup($repo, 'branch2', 1); +$r = $repo -> merge_analysis($branch2); is_deeply $r, ['normal']; Git::Raw::Graph -> is_descendant_of($repo, $branch1, $branch2), 0; @@ -316,6 +318,7 @@ $repo -> checkout($repo -> head($master), { 'force' => 1 }}); +$branch3 = Git::Raw::Branch -> lookup($repo, 'branch3', 1); $r = $repo -> merge_analysis($branch3); is_deeply $r, ['normal']; diff --git a/xs/Indexer.xs b/xs/Indexer.xs index 5efbf2b7..4d0daa73 100644 --- a/xs/Indexer.xs +++ b/xs/Indexer.xs @@ -12,7 +12,7 @@ new(class, path, odb) CODE: rc = git_indexer_new(&indexer, git_ensure_pv(path, "path"), - 0, GIT_SV_TO_PTR(Odb, odb), NULL, NULL); + 0, GIT_SV_TO_PTR(Odb, odb), NULL); git_check_error(rc); GIT_NEW_OBJ_WITH_MAGIC( |