Bug#1009031: possible workaround for libgit-raw-perl FTBFS with libgit2 1.3.0

2022-10-23 Thread gregor herrmann
Control: tag -1 + fixed-upstream

On Sun, 23 Oct 2022 17:17:22 +0200, gregor herrmann wrote:

> On Sat, 22 Oct 2022 18:48:31 +0200, Étienne Mollier wrote:
> 
> > Taking the approach of refreshing the test suite to match the
> > output produced by the new libgit2 seems to do the job to
> > address the test suite failure.  I also checked this has no
> > adverse effects on reverse dependencies.  Variations between the
> > reference and the new update are also minimal and seem to make
> > sense.
> 
> Interesting finding!
> The last time I looked I had the impression that this needs more
> changes / changes in the actual code but obviously I was wrong.

And now this is apparently fixed upstream in the 0.89 release:

https://github.com/jacquesg/p5-Git-Raw/issues/222#issuecomment-1288150066


Cheers,
gregor

-- 
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
   `-   


signature.asc
Description: Digital Signature


Bug#1009031: possible workaround for libgit-raw-perl FTBFS with libgit2 1.3.0

2022-10-23 Thread gregor herrmann
On Sat, 22 Oct 2022 18:48:31 +0200, Étienne Mollier wrote:

> Taking the approach of refreshing the test suite to match the
> output produced by the new libgit2 seems to do the job to
> address the test suite failure.  I also checked this has no
> adverse effects on reverse dependencies.  Variations between the
> reference and the new update are also minimal and seem to make
> sense.

Interesting finding!
The last time I looked I had the impression that this needs more
changes / changes in the actual code but obviously I was wrong.

The only additional remark I have is:

-   libgit2-dev (>= 1.1.0),
+   libgit2-dev (>= 1.5.0),

as with your patch the tests fail in stable/bullseye.
 

Cheers,
gregor

-- 
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
   `-   


signature.asc
Description: Digital Signature


Bug#1009031: possible workaround for libgit-raw-perl FTBFS with libgit2 1.3.0

2022-10-22 Thread Étienne Mollier
Control: tags -1 patch

Hi,

Taking the approach of refreshing the test suite to match the
output produced by the new libgit2 seems to do the job to
address the test suite failure.  I also checked this has no
adverse effects on reverse dependencies.  Variations between the
reference and the new update are also minimal and seem to make
sense.

It would be welcome if someone else could have a look; maybe
there are breakages I haven't seen.  Also, upstream gave the
impression that changes were maybe not that obvious, in which
case it would be better to wait for an upcoming module version,
compatible with the current libgit2 hopefully.

In hope this helps,
-- 
Étienne Mollier 
Fingerprint:  8f91 b227 c7d6 f2b1 948c  8236 793c f67e 8f0d 11da
Sent from /dev/pts/4, please excuse my verbosity.
Description: update test suite expectations to match libgit2 behavior.
Author: Étienne Mollier 
Bug: https://github.com/jacquesg/p5-Git-Raw/issues/222
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1009031
Last-Update: 2022-10-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- libgit-raw-perl.orig/t/02-commit.t
+++ libgit-raw-perl/t/02-commit.t
@@ -296,7 +296,7 @@
 $expected_patch = qq{
 From $commit2_id Mon Sep 17 00:00:00 2001
 From: Git::Raw author 
-Subject: second commit
+Subject: [1/2] second commit
 
 ---
  test2 | 1 +
--- libgit-raw-perl.orig/t/15-merge.t
+++ libgit-raw-perl/t/15-merge.t
@@ -238,7 +238,7 @@
 $index -> write;
 
 my $merge_msg = $repo -> message();
-is $merge_msg, "Merge branch 'branch2'\n\nConflicts:\n\ttest1\n";
+is $merge_msg, "Merge branch 'branch2'\n\n#Conflicts:\n#\ttest1\n";
 
 my $target = $master -> target;
 $commit = $repo -> commit("Merge commit!", $me, $me, [$target, $commit2],


signature.asc
Description: PGP signature