GNU bug report logs - #29976
[PATCH] gnu: Add git-subtree.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 29976 in the body.
You can then email your comments to 29976 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
To: <guix-patches <at> gnu.org>
Cc: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
Subject: [PATCH] gnu: Add git-subtree.
Date: Thu, 4 Jan 2018 13:26:35 +0100

* gnu/packages/version-control.scm (git-subtree): New variable.
---
 gnu/packages/version-control.scm | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index cbf5ce7d8..d4c8acb51 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2014, 2016 Eric Bavier <bavier <at> member.fsf.org>
 ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2015 Kyle Meyer <kyle <at> kyleam.com>
-;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado <at> elephly.net>
+;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2016, 2017 ng0 <contact.ng0 <at> cryptolab.net>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
@@ -50,6 +50,7 @@
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages cook)
@@ -375,6 +376,31 @@ everything from small to very large projects with speed and efficiency.")
    (license license:gpl2)
    (home-page "https://git-scm.com/")))
 
+(define-public git-subtree
+  (package (inherit git)
+    (name "git-subtree")
+    (outputs '("out"))
+    (arguments
+     `(#:make-flags
+       (list (string-append "prefix=" (assoc-ref %outputs "out"))
+             (string-append "SHELL_PATH="
+                            (assoc-ref %build-inputs "bash")
+                            "/bin/sh"))
+       ;; Don't run tests because this assumes that we've built git in a
+       ;; parent directory.
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda _ (chdir "contrib/subtree"))))))
+    (native-inputs
+     `(("bash" ,bash)))
+    (inputs '())
+    (synopsis "Merge git subtrees and split repository into subtrees")
+    (description "This package provides the @code{subtree} subcommand for git.
+Subtrees allow subprojects to be included within a subdirectory of the main
+project, optionally including the subproject's entire history.")))
+
 (define-public libgit2
   (package
     (name "libgit2")
-- 
2.15.1

Message #8 received at 29976 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
Cc: 29976 <at> debbugs.gnu.org
Subject: Re: [bug#29976] [PATCH] gnu: Add git-subtree.
Date: Thu, 4 Jan 2018 13:02:28 -0500

[Message part 1 (text/plain, inline)]

On Thu, Jan 04, 2018 at 01:26:35PM +0100, Ricardo Wurmus wrote:
> * gnu/packages/version-control.scm (git-subtree): New variable.

Why not include this in the regular Git package?

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 29976 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
To: Leo Famulari <leo <at> famulari.name>
Cc: 29976 <at> debbugs.gnu.org
Subject: Re: [bug#29976] [PATCH] gnu: Add git-subtree.
Date: Thu, 4 Jan 2018 22:28:18 +0100

Leo Famulari <leo <at> famulari.name> writes:

> On Thu, Jan 04, 2018 at 01:26:35PM +0100, Ricardo Wurmus wrote:
>> * gnu/packages/version-control.scm (git-subtree): New variable.
>
> Why not include this in the regular Git package?

I just wanted to use git-subtree without having to rebuild all packages
that use git for fetching the sources.

We could make this part of the regular git package, but only on
(the next) core-updates.

--
Ricardo

Message #14 received at 29976 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
Cc: 29976 <at> debbugs.gnu.org
Subject: Re: [bug#29976] [PATCH] gnu: Add git-subtree.
Date: Thu, 4 Jan 2018 16:49:51 -0500

[Message part 1 (text/plain, inline)]

On Thu, Jan 04, 2018 at 10:28:18PM +0100, Ricardo Wurmus wrote:
> 
> Leo Famulari <leo <at> famulari.name> writes:
> 
> > On Thu, Jan 04, 2018 at 01:26:35PM +0100, Ricardo Wurmus wrote:
> >> * gnu/packages/version-control.scm (git-subtree): New variable.
> >
> > Why not include this in the regular Git package?
> 
> I just wanted to use git-subtree without having to rebuild all packages
> that use git for fetching the sources.
> 
> We could make this part of the regular git package, but only on
> (the next) core-updates.

I didn't realize this was an issue. We update the Git package whenever
there is a new release.

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 29976 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
Cc: 29976 <at> debbugs.gnu.org
Subject: Re: [bug#29976] [PATCH] gnu: Add git-subtree.
Date: Thu, 4 Jan 2018 16:54:45 -0500

[Message part 1 (text/plain, inline)]

On Thu, Jan 04, 2018 at 04:49:51PM -0500, Leo Famulari wrote:
> > I just wanted to use git-subtree without having to rebuild all packages
> > that use git for fetching the sources.
> > 
> > We could make this part of the regular git package, but only on
> > (the next) core-updates.
> 
> I didn't realize this was an issue. We update the Git package whenever
> there is a new release.

Thinking about it for another minute, shouldn't those packages not need
to be rebuilt, since origins are fixed-output derivations?

[signature.asc (application/pgp-signature, inline)]

Message #20 received at 29976 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
To: Leo Famulari <leo <at> famulari.name>
Cc: 29976 <at> debbugs.gnu.org
Subject: Re: [bug#29976] [PATCH] gnu: Add git-subtree.
Date: Fri, 5 Jan 2018 07:50:23 +0100

Leo Famulari <leo <at> famulari.name> writes:

> On Thu, Jan 04, 2018 at 04:49:51PM -0500, Leo Famulari wrote:
>> > I just wanted to use git-subtree without having to rebuild all packages
>> > that use git for fetching the sources.
>> > 
>> > We could make this part of the regular git package, but only on
>> > (the next) core-updates.
>> 
>> I didn't realize this was an issue. We update the Git package whenever
>> there is a new release.
>
> Thinking about it for another minute, shouldn't those packages not need
> to be rebuilt, since origins are fixed-output derivations?

Yes, you are right.  I didn’t think of this.
So, I’m going to add this as a phase to the git package.

-- 
Ricardo

Message #23 received at 29976 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
Cc: 29976 <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#29976] [PATCH] gnu: Add git-subtree.
Date: Mon, 23 Apr 2018 15:01:07 +0200

Hello,

Any update on this one?

Ludo'.

Message #28 received at 29976-done <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: 29976-done <at> debbugs.gnu.org
Subject: gnu: Add git-subtree.
Date: Mon, 25 Jun 2018 12:06:14 +0200

[Message part 1 (text/plain, inline)]

Should be done as part of git build.

[Message part 2 (text/html, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.