From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX4cv-00043v-IS for guix-patches@gnu.org; Thu, 04 Jan 2018 07:28:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX4cs-0007Rv-9o for guix-patches@gnu.org; Thu, 04 Jan 2018 07:28:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54655) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX4cs-0007Rj-5n for guix-patches@gnu.org; Thu, 04 Jan 2018 07:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eX4cs-0003oW-03 for guix-patches@gnu.org; Thu, 04 Jan 2018 07:28:02 -0500 Subject: [bug#29976] [PATCH] gnu: Add git-subtree. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX4bw-00037M-5V for guix-patches@gnu.org; Thu, 04 Jan 2018 07:27:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX4bs-00061a-E8 for guix-patches@gnu.org; Thu, 04 Jan 2018 07:27:04 -0500 Received: from pegasus.bbbm.mdc-berlin.de ([141.80.25.20]:53760) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eX4bs-0005xy-3S for guix-patches@gnu.org; Thu, 04 Jan 2018 07:27:00 -0500 Received: from localhost (localhost [127.0.0.1]) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTP id 2BB3263872F for ; Thu, 4 Jan 2018 13:26:58 +0100 (CET) Received: from pegasus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (pegasus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lEXMzI-rsKDc for ; Thu, 4 Jan 2018 13:26:52 +0100 (CET) Received: from HTCATWO.mdc-berlin.net (puck.citx.mdc-berlin.de [141.80.36.101]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTPS for ; Thu, 4 Jan 2018 13:26:52 +0100 (CET) From: Ricardo Wurmus Date: Thu, 4 Jan 2018 13:26:35 +0100 Message-ID: <20180104122635.7097-1-ricardo.wurmus@mdc-berlin.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29976@debbugs.gnu.org Cc: 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-cont= rol.scm index cbf5ce7d8..d4c8acb51 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -8,7 +8,7 @@ ;;; Copyright =C2=A9 2014, 2016 Eric Bavier ;;; Copyright =C2=A9 2015, 2016, 2017 Efraim Flashner ;;; Copyright =C2=A9 2015 Kyle Meyer -;;; Copyright =C2=A9 2015, 2017 Ricardo Wurmus +;;; Copyright =C2=A9 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2016, 2017 Leo Famulari ;;; Copyright =C2=A9 2016, 2017 ng0 ;;; Copyright =C2=A9 2017 Tobias Geerinckx-Rice @@ -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 sp= eed and efficiency.") (license license:gpl2) (home-page "https://git-scm.com/"))) =20 +(define-public git-subtree + (package (inherit git) + (name "git-subtree") + (outputs '("out")) + (arguments + `(#:make-flags + (list (string-append "prefix=3D" (assoc-ref %outputs "out")) + (string-append "SHELL_PATH=3D" + (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 fo= r git. +Subtrees allow subprojects to be included within a subdirectory of the m= ain +project, optionally including the subproject's entire history."))) + (define-public libgit2 (package (name "libgit2") --=20 2.15.1