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

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Gábor Boskovits <boskovits <at> gmail.com>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#29976: closed ([PATCH] gnu: Add git-subtree.)
Date: Mon, 25 Jun 2018 10:07:02 +0000

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

Your message dated Mon, 25 Jun 2018 12:06:14 +0200
with message-id <CAE4v=pg49RJCJf6-w_k4uX25G9fpecLB_ufW+pKx08U4=Pr+BA <at> mail.gmail.com>
and subject line gnu: Add git-subtree.
has caused the debbugs.gnu.org bug report #29976,
regarding [PATCH] gnu: Add git-subtree.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
29976: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=29976
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

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 part 3 (message/rfc822, inline)]

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 4 (text/plain, inline)]

Should be done as part of git build.

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

Previous Next

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