Patchwork gnu: git: Update to 2.10.0.

login
register
mail settings
Submitter John Darrington
Date Sept. 3, 2016, 10:51 a.m.
Message ID <1472899904-30530-1-git-send-email-jmd@gnu.org>
Download mbox | patch
Permalink /patch/15239/
State New
Headers show

Comments

John Darrington - Sept. 3, 2016, 10:51 a.m.
* gnu/packages/version-control.scm (git): Update to 2.10.0.
---
 gnu/packages/version-control.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Ludovic Courtès - Sept. 3, 2016, 1:58 p.m.
John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/version-control.scm (git): Update to 2.10.0.

Please push, thanks!

Ludo’.
Leo Famulari - Sept. 3, 2016, 2:02 p.m.
On Sat, Sep 03, 2016 at 12:51:44PM +0200, John Darrington wrote:
> * gnu/packages/version-control.scm (git): Update to 2.10.0.

Looks good, please push.
Mark H Weaver - Sept. 4, 2016, 4:02 p.m.
John Darrington <jmd@gnu.org> writes:
> * gnu/packages/version-control.scm (git): Update to 2.10.0.

This update seems to have broken 'cgit' and maybe also 'ruby-puma'.

  https://hydra.gnu.org/eval/109142#tabs-now-fail

Would you be willing to take a look?

     Mark
John Darrington - Sept. 4, 2016, 5:37 p.m.
On Sun, Sep 04, 2016 at 12:02:49PM -0400, Mark H Weaver wrote:
     John Darrington <jmd@gnu.org> writes:
     > * gnu/packages/version-control.scm (git): Update to 2.10.0.
     
     This update seems to have broken 'cgit' and maybe also 'ruby-puma'.
     
       https://hydra.gnu.org/eval/109142#tabs-now-fail
     

Well so far as I can see, cgit is directly accessing the private interface
of git.  So unless we revert, or maintain two version of git concurrently,
I don't see a solution.

J'
Leo Famulari - Sept. 4, 2016, 6:14 p.m.
On Sun, Sep 04, 2016 at 07:37:21PM +0200, John Darrington wrote:
> On Sun, Sep 04, 2016 at 12:02:49PM -0400, Mark H Weaver wrote:
>      John Darrington <jmd@gnu.org> writes:
>      > * gnu/packages/version-control.scm (git): Update to 2.10.0.
>      
>      This update seems to have broken 'cgit' and maybe also 'ruby-puma'.
>      
>        https://hydra.gnu.org/eval/109142#tabs-now-fail
>      
> 
> Well so far as I can see, cgit is directly accessing the private interface
> of git.  So unless we revert, or maintain two version of git concurrently,
> I don't see a solution.

Relevant upstream discussion:
https://lists.zx2c4.com/pipermail/cgit/2016-August/003243.html
Leo Famulari - Sept. 4, 2016, 6:57 p.m.
On Sun, Sep 04, 2016 at 02:14:47PM -0400, Leo Famulari wrote:
> > On Sun, Sep 04, 2016 at 12:02:49PM -0400, Mark H Weaver wrote:
> >      This update seems to have broken 'cgit' and maybe also 'ruby-puma'.
> Relevant upstream discussion:
> https://lists.zx2c4.com/pipermail/cgit/2016-August/003243.html

Updated patch:
https://lists.zx2c4.com/pipermail/cgit/2016-September/003295.html
Ludovic Courtès - Sept. 5, 2016, 8:12 a.m.
Leo Famulari <leo@famulari.name> skribis:

> On Sun, Sep 04, 2016 at 02:14:47PM -0400, Leo Famulari wrote:
>> > On Sun, Sep 04, 2016 at 12:02:49PM -0400, Mark H Weaver wrote:
>> >      This update seems to have broken 'cgit' and maybe also 'ruby-puma'.
>> Relevant upstream discussion:
>> https://lists.zx2c4.com/pipermail/cgit/2016-August/003243.html
>
> Updated patch:
> https://lists.zx2c4.com/pipermail/cgit/2016-September/003295.html

As discussed on IRC, given that the patch is not so small, I’d suggest
re-introducing Git 2.9 (with ‘inherit’) and using it for cgit (and maybe
‘ruby-puma’?).

John, could you look into it?

Thanks Leo for finding out the upstream thread!

Ludo’.

Patch

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 34cfedf..9ff9801 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -111,14 +111,14 @@  as well as the classic centralized workflow.")
 (define-public git
   (package
    (name "git")
-   (version "2.9.3")
+   (version "2.10.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://kernel.org/software/scm/git/git-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "0qzs681a64k3shh5p0rg41l1z16fbk5sj0xga45k34hp1hsp654z"))))
+              "1rr9zyafb6q3wixyjar6cc7z7vdh1dqa4b5irz3gz1df02n68cy7"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("native-perl" ,perl)
@@ -131,7 +131,7 @@  as well as the classic centralized workflow.")
                 version ".tar.xz"))
           (sha256
            (base32
-            "0kabsmjfbvq4y1vlwq0yl2y4033a90rnwsq01d7np3cvy55fiq0l"))))))
+            "1y92v1bxk67ilsizqnjba6hqvrsy2zvmipyd9nnz865s21yrj5ry"))))))
    (inputs
     `(("curl" ,curl)
       ("expat" ,expat)