From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id CFVsIsrfoma2HAAAe85BDQ:P1 (envelope-from ) for ; Thu, 25 Jul 2024 23:29:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id CFVsIsrfoma2HAAAe85BDQ (envelope-from ) for ; Fri, 26 Jul 2024 01:29:14 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=KuCzap+U; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1721950154; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=MfvqataUDE9gD3lSD6dbuJSb9aDM0RWzk0yxxzGxqy0=; b=ZrUCmY1IpTvcrh1kpiZHCUOEVbasZbO+71tFXzJNcA/1rSaAf0RJd1dPCSGFLj2ObEGixB VyWsn4McJqDg9tNaiE90tllm+8uannyD2VKJp/EQc5Dg96UuPX3m7TE3aptbbicEyaZMpw PPf9SbLFAfSa1Yyw57fItU5oyV/FyqQbwlLw+JqC7vXs0u++n1P18OjBgqFedSiS4xOW1j HQ4w5uBYJqvbTr05MDRDVkBb2O4nx7GbwVHocULF4eWJYqwuFQM2DEZ7cSsVaGlb05Bz4a 43zP0iFVJb1SfJP5iikqBvgXDmSta2r/OGrgnjpPRtPKTTeybLV+7RBTeIG1zA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1721950154; a=rsa-sha256; cv=none; b=hLAD5rnjH/sRq42D5FRJaUIQkp3N56nnYA0xy4SZnVMqKzT7YEWZKnPHn0DIjmRwBsadTV CNzgc59R28vJOFYcCKpClye5Ju0K+b6v3wzEaYIzLsEAaTxX72OSsKzEemLZcH0e7wjXJc G8fm4wRCpWIFBd5nVIsPoo1hhsyId9iiKHRAXimoLZuOotrrglftPDz5LCTcfgFtYRZNaD 0obm8RvDHT06F2NBJg4mK47YIhRolN+XWpQMpr5ugc/rFW8wF8XBfjmnkOmuNiAt+njjrB 351BnQL8BfXtmNQzmv9ZxFrPNdbgKtMFb65CJiJasQpx3I5SZ7YCdp+YSuledg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=KuCzap+U; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 251E072B64 for ; Fri, 26 Jul 2024 01:29:14 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sX7tH-0001gP-D2; Thu, 25 Jul 2024 19:28:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sX7tG-0001gG-Kk for guix-patches@gnu.org; Thu, 25 Jul 2024 19:28:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sX7tG-00080r-CL for guix-patches@gnu.org; Thu, 25 Jul 2024 19:28:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sX7tO-0005yK-5b for guix-patches@gnu.org; Thu, 25 Jul 2024 19:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72299] [PATCH v2] gnu: Add git-tools. References: In-Reply-To: Resent-From: "Suhail Singh" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Jul 2024 23:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72299 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72299@debbugs.gnu.org Received: via spool by 72299-submit@debbugs.gnu.org id=B72299.172195010022889 (code B ref 72299); Thu, 25 Jul 2024 23:29:02 +0000 Received: (at 72299) by debbugs.gnu.org; 25 Jul 2024 23:28:20 +0000 Received: from localhost ([127.0.0.1]:38015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sX7si-0005x6-3t for submit@debbugs.gnu.org; Thu, 25 Jul 2024 19:28:20 -0400 Received: from mail-oa1-f68.google.com ([209.85.160.68]:38061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sX7sf-0005wt-Lu for 72299@debbugs.gnu.org; Thu, 25 Jul 2024 19:28:19 -0400 Received: by mail-oa1-f68.google.com with SMTP id 586e51a60fabf-2643667f0c8so67433fac.0 for <72299@debbugs.gnu.org>; Thu, 25 Jul 2024 16:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721950024; x=1722554824; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:date:message-id :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=MfvqataUDE9gD3lSD6dbuJSb9aDM0RWzk0yxxzGxqy0=; b=KuCzap+U0ircT1Xko191H5LOuVcLhTmxiusWBsYGpXdcY23FcMGmEyraZRWxhNubGb BwR3HGPY4aBk7ZbLr6z7Tco4nBYqT55ydKtyfjcx3HzqpdI0pyM/YcAEH/eBmCqX0M6k l0f0+xLIvCyywdClMYMvtQfKfAXfmzf0ufGmaMjzASOtTaj+yeAxEHYKNrZRFTozGS1t TQrxK1q8nHnzcH6W6Zbk6gHQ4WgAvpoEGVptXJ5m91PtLTABY68drjrhYW8OH/2Di/MW g5Y64Y3v8uOGZozhIkVGrMsXniPMLFPEaaClSFoL0miQbyoMenGL9kBFTIZ2yk2bGStf oMIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721950024; x=1722554824; h=content-transfer-encoding:mime-version:user-agent:date:message-id :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MfvqataUDE9gD3lSD6dbuJSb9aDM0RWzk0yxxzGxqy0=; b=fxOvNcwY1JYpF1WOFoo8yWDrMiaWfdWRqD6g7Y3+QYwoSOx7zuDqBsIfyuXaz81EtP QoXYzBncbeVemSMfd0pB9kThSf7TxYwbH1z5ureKb+y6icsMrL18HhOQjAMF7p7mqrY1 ia67o0w4875JMc60LhxdEeVVgpumB22YkJvDHqps0WrX/t9FxJKRzLIqYTHJ/Lin85fm by6oon5+59KhOIWuJ2cc/Y+iZsDIIY1oO/+rWXfsZjQmpGYSkaDq32i7KdK/fnZ9Mi4H bE92JF4ctQZ1eN2a4C97UJNdpvNsd5p5/qWkK1FB+I4U/LldDiOvMgU3Ofthv4Gtf9q8 T0uQ== X-Gm-Message-State: AOJu0YxwwyABuIZeBWDuVgZToTCuBAhBiA0fhsqqoJSboL4F5BMmZnL+ FT53+1Mj1NymDJDt6Uy2wueNM7PvUUNyQ2gwQLPFfRUvB3f2sZSIZ1WCq6UI X-Google-Smtp-Source: AGHT+IGzp67nL4w8dFEsgIVuTJ8hyhGOVsXGbH/1BpjLbzon93krC5KjsNpO7FgIE2CL/DPHBrpEQQ== X-Received: by 2002:a05:6359:4c81:b0:1ac:f436:c8d2 with SMTP id e5c5f4694b2df-1acfac838acmr280650755d.1.1721950023425; Thu, 25 Jul 2024 16:27:03 -0700 (PDT) Received: from gnus ([65.93.169.47]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6bb3f8db5b7sm11493106d6.12.2024.07.25.16.27.02 for <72299@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 16:27:03 -0700 (PDT) From: "Suhail Singh" Message-ID: <073c93709b52c4683873da7da088d5af25ed1552.1721949854.git.suhail@bayesians.ca> Date: Thu, 25 Jul 2024 19:26:52 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.32 X-Spam-Score: -2.32 X-Migadu-Queue-Id: 251E072B64 X-Migadu-Scanner: mx11.migadu.com X-TUID: pj0F2gZKK/md * gnu/packages/version-control.scm (git-tools): New variable. Change-Id: I0ac65c24f787714fe0ef234fce639c6ec561600d --- gnu/packages/version-control.scm | 41 ++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-contro= l.scm index cf7f7b0ad8..09309c8439 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -52,6 +52,7 @@ ;;; Copyright =C2=A9 2023 Steve George ;;; Copyright =C2=A9 2023 Josselin Poiret ;;; Copyright =C2=A9 2024 Hilton Chain +;;; Copyright =C2=A9 2024 Suhail Singh ;;; ;;; This file is part of GNU Guix. ;;; @@ -830,6 +831,46 @@ (define-public git-cal to GitHub contributions calendar.") (license license:expat))) =20 +(define-public git-tools + (package + (name "git-tools") + (version "2022.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MestreLion/git-tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s8x74ggcr6nqzplr0jfzp3cavq0nmdm35hqywzs2bbq75i1mijd")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("git-branches-rename" "bin/git-branches-rename") + ("git-clone-subset" "bin/git-clone-subset") + ("git-find-uncommitted-repos" + "bin/git-find-uncommitted-repos") + ("git-rebase-theirs" "bin/git-rebase-theirs") + ("git-restore-mtime" "bin/git-restore-mtime") + ("git-strip-merge" "bin/git-strip-merge") + ("./man1/" "share/man/man1" + #:include-regexp (".*\\.1$"))))) + (inputs (list bash-minimal git-minimal python-minimal)) + (home-page "https://github.com/MestreLion/git-tools") + (synopsis "Assorted git-related scripts and tools") + (description "@code{git-tools} is a collection of bash and python scri= pts. +Specifically, it includes the following tools: + +@itemize +@item @code{git-branches-rename} +@item @code{git-clone-subset} +@item @code{git-find-uncommitted-repos} +@item @code{git-rebase-theirs} +@item @code{git-restore-mtime} +@item @code{git-strip-merge} +@end itemize") + (license license:gpl3))) + (define-public xdiff (let ((revision "0") (commit "a137bc7ee6c76618ed1737c257548eaa10ac0089")) base-commit: 03062c7a9fd74d625639e1a325e9cb58d1cd74e3 --=20 2.45.2