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

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

[Ricardo Wurmus]

* 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@member.fsf.org>
 ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
-;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@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

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

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

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?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Ricardo Wurmus]

Leo Famulari <leo@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

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

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 634 bytes --]

On Thu, Jan 04, 2018 at 10:28:18PM +0100, Ricardo Wurmus wrote:
> 
> Leo Famulari <leo@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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

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?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Ricardo Wurmus]

Leo Famulari <leo@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

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

[Ludovic Courtès]

Hello,

Any update on this one?

Ludo'.

bug#29976: gnu: Add git-subtree.

[Gábor Boskovits]

[-- Attachment #1: Type: text/plain, Size: 37 bytes --]

Should be done as part of git build.

[-- Attachment #2: Type: text/html, Size: 58 bytes --]