From unknown Mon Jun 23 05:59:18 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#72299 <72299@debbugs.gnu.org> To: bug#72299 <72299@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Add git-tools. Reply-To: bug#72299 <72299@debbugs.gnu.org> Date: Mon, 23 Jun 2025 12:59:18 +0000 retitle 72299 [PATCH] gnu: Add git-tools. reassign 72299 guix-patches submitter 72299 "Suhail Singh" severity 72299 normal tag 72299 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 25 15:34:49 2024 Received: (at submit) by debbugs.gnu.org; 25 Jul 2024 19:34:49 +0000 Received: from localhost ([127.0.0.1]:37812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sX4Ei-0008Eo-Nu for submit@debbugs.gnu.org; Thu, 25 Jul 2024 15:34:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:36674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sX4Eg-0008Eg-Er for submit@debbugs.gnu.org; Thu, 25 Jul 2024 15:34:47 -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 1sX4EY-0000Lj-IX for guix-patches@gnu.org; Thu, 25 Jul 2024 15:34:38 -0400 Received: from mail-qv1-xf44.google.com ([2607:f8b0:4864:20::f44]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sX4EW-0004k6-V4 for guix-patches@gnu.org; Thu, 25 Jul 2024 15:34:38 -0400 Received: by mail-qv1-xf44.google.com with SMTP id 6a1803df08f44-6b7a433857aso1866306d6.2 for ; Thu, 25 Jul 2024 12:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721936075; x=1722540875; darn=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=vdGaKtopSZcQwbC9yrnT2M2EC3fsNUocE8eUlmX79RQ=; b=D6lC8xLhFcT+RdB56/dAm+PIwhpfLABjQf8m7w2xol90gFrCvEQhacyrGnQg2iQ8Ca 1Tk5QRinsfugZGNDSvyQY3BjY7gzrZNFwVOwSrAB/dsera4bdCv+NhUMgSz/RUTxZtG8 1x/Xw+nZn0OijUtoF3yxjpy5/eL8ZE2useIQaQEckMqNyJFpRG+NTGol6uuSX17uoIub LrPcKXDZcj2m+m/aoX3ZwFUCdJjJmcwuLXIHuyWt75asgp+/eov4Si/cAdyb1cKSlhNM EHZK7BHvg7NtKrjQ/1PdHxJccv/7o3clRUohHQPrB2PNcWQPgpiogDrqGcA7rZHs513a HVAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721936075; x=1722540875; 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=vdGaKtopSZcQwbC9yrnT2M2EC3fsNUocE8eUlmX79RQ=; b=iXsI58z6OL3Q5V1JpU9dzjCXSoOgl/aj24QtGqEslncOYdGqyPaMdD5CMoKInfhXal XUg9MMoqlhp00z8g4QpT2d4eeRz3KsI98GGG94UPW1oOpogSYrNLn7kom8O/JeuWlMI+ uuNSH/H/gCLA52DOU11+aLo4k39QhrNRuCy0/E3wus4t+c4HKAJUYWKEow9E2gR1rD65 5jL8U+M1hTdMteDWCKECBcLePCU0IaFyufsFb5fZtJWmLSnejzPEr5uFdHNxvtIrOLeP WZ3kNGcXlCl3Rz8v7v3xullWeHWtAWQAoRPn/i+ie/zFNif7VFAw4Vpc9agnWUBfML/P XiCA== X-Gm-Message-State: AOJu0Yz/gc3eIt5HLQD05zWedg7cSQK2Jww4gqTyavQ5fFR/+4++2C4g b6lQP6t04mPEEwcHqIyczsX9Xlke2QTmoOr3A/6Rh/OntnjySSvz1fqOFnNb X-Google-Smtp-Source: AGHT+IEy/f/KzulH39q4L2F+W7+WVXmfGFs472+N+3coqSryhzcj5yJkSr61VTH+m0OnxYs4Ld2NFQ== X-Received: by 2002:a05:620a:28cd:b0:7a1:5683:b04b with SMTP id af79cd13be357-7a1d69d2950mr237974785a.9.1721936074957; Thu, 25 Jul 2024 12:34:34 -0700 (PDT) Received: from gnus (modemcable060.24-160-184.mc.videotron.ca. [184.160.24.60]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a1d7435d1esm111203185a.78.2024.07.25.12.34.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 12:34:34 -0700 (PDT) From: "Suhail Singh" To: Guix-patches mailing list Subject: [PATCH] gnu: Add git-tools. Message-ID: Date: Thu, 25 Jul 2024 15:34:33 -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 Received-SPF: pass client-ip=2607:f8b0:4864:20::f44; envelope-from=suhailsingh247@gmail.com; helo=mail-qv1-xf44.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) * gnu/packages/version-control.scm (git-tools): Add git-tools v2022.12. 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 25 19:28:20 2024 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" To: 72299@debbugs.gnu.org Subject: [PATCH v2] gnu: Add git-tools. 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-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 72299 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 30 01:07:31 2024 Received: (at 72299) by debbugs.gnu.org; 30 Jul 2024 05:07:31 +0000 Received: from localhost ([127.0.0.1]:46748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYf58-00018P-Re for submit@debbugs.gnu.org; Tue, 30 Jul 2024 01:07:31 -0400 Received: from mail-ua1-f66.google.com ([209.85.222.66]:37940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYf56-00018A-C1 for 72299@debbugs.gnu.org; Tue, 30 Jul 2024 01:07:29 -0400 Received: by mail-ua1-f66.google.com with SMTP id a1e0cc1a2514c-822e9b0059cso108447241.0 for <72299@debbugs.gnu.org>; Mon, 29 Jul 2024 22:07:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722315968; x=1722920768; 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=3/OXzfye6H1XQbeoUqCqUasuJbD7v2TjsFIESzG0rzY=; b=RGE0iuKSKxjXZCAcaFr9bQ2OmlqXS7YhLbH9rt42QBVjiyxWkZghQ2+wIhTgEJOzgp tOg08eo4AnZeoKCq7qVbECK2S0TqBjJqNodGTAr3D21lZ5foqyPDLLp2l7e/tAv+4OlC VPGZQrAN/FjSONDLA7NIEO7ETtuUTzpQffSAPi7+ywlmjDWTsWgFog/xjnfQ1yn1DMsS Rn7TEHcVlm3dz7WHtiLVg3O6x/Zi+pO1UpgY2zQoABDYASLcCFRZoDkTFtYk8wwCCxUf FbwyNkKIrsTYoRzaIr1jJJAdxWspCBV1LV7WNkimJXpk3TFPe17QDCtcPKmDn61EAKnE ehSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722315968; x=1722920768; 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=3/OXzfye6H1XQbeoUqCqUasuJbD7v2TjsFIESzG0rzY=; b=KGNF2ksFuk0ZuobMOkpZwJg1DJwocW619VSy9CfPQ7M315KwvlU+3pMFVAa3qy2469 qcKem4ANyiWwqcNQ0NyUwM/qJIVSeFgu1cJGFP1itQ2eH2NbAjcyZl1xcruCI07iAHYv Eu3Bf25/AjAP5goAPbo9D4Ec7vZCcKx+CLMtIbjuRlCoMgsmbkI/xvbQ2OlxarY/nMIn SEgt7yHAC9h5WgEnx9RVnZxKEBNWmDIH1wU2UlPbijRDLaxLHYPTUvuVei7/x+SJwkzu u5pdFoe3HMA00WecZtwSQwUgPfkok/6lz+1bXR/FL5tX3ZQ1EgkvZHKKdW+S7uxO0cQ5 izBA== X-Gm-Message-State: AOJu0Yw8WO7O0HMC4xkReOrJm2nTePYjQUHecLh7DLOMkjfY36jzUIea T88H2LPLSxS1lX6M1AGVkihbserPD3Rn+ZExWkTfkHOcnOz9MeEi7rDWEshm X-Google-Smtp-Source: AGHT+IGT6TMxVJAPDrf8dzK9tuK/gcHPOHTX7+NQlH7t8SxmkGR1QcQlW/y2KbPU3oIj9zTf/NZ5ZA== X-Received: by 2002:a05:6102:26c9:b0:493:bb70:940 with SMTP id ada2fe7eead31-493d82759ccmr10913695137.2.1722315968014; Mon, 29 Jul 2024 22:06:08 -0700 (PDT) Received: from gnus ([65.93.169.47]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a1f3a51644sm183332285a.16.2024.07.29.22.06.07 for <72299@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 22:06:07 -0700 (PDT) From: Suhail Singh To: 72299@debbugs.gnu.org Subject: [PATCH v3] gnu: Add git-tools. Message-ID: Date: Tue, 30 Jul 2024 01:05:56 -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-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/version-control.scm (git-tools): New variable. Change-Id: I0ac65c24f787714fe0ef234fce639c6ec561600d --- gnu/packages/version-control.scm | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (suhailsingh247[at]gmail.com) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (suhailsingh247[at]gmail.com) 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.222.66 listed in bl.score.senderscore.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.222.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.222.66 listed in list.dnswl.org] X-Debbugs-Envelope-To: 72299 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) * gnu/packages/version-control.scm (git-tools): New variable. Change-Id: I0ac65c24f787714fe0ef234fce639c6ec561600d --- gnu/packages/version-control.scm | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-contro= l.scm index cf7f7b0ad8..d5887f3fbc 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,52 @@ (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 scripts. +Specifically, it includes the following tools: + +@itemize +@item @code{git-branches-rename}: Batch rename branches with a matching pr= efix +to another prefix +@item @code{git-clone-subset}: Clone a subset of a git repository +@item @code{git-find-uncommitted-repos}: Recursively list repositories in = the +given directory(ies) that have uncommitted changes +@item @code{git-rebase-theirs}: Resolve rebase conflicts and failed +cherry-picks by favoring \"theirs\" version +@item @code{git-restore-mtime}: Restore modification time of files based on +the date of the most recent commit that modified them +@item @code{git-strip-merge}: A git-merge wrapper that deletes files on a +\"foreign\" branch before merging +@end itemize") + (license license:gpl3+))) + (define-public xdiff (let ((revision "0") (commit "a137bc7ee6c76618ed1737c257548eaa10ac0089")) base-commit: 03062c7a9fd74d625639e1a325e9cb58d1cd74e3 --=20 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 30 19:59:05 2024 Received: (at 72299-done) by debbugs.gnu.org; 30 Jul 2024 23:59:05 +0000 Received: from localhost ([127.0.0.1]:48734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYwkD-0004S2-Gn for submit@debbugs.gnu.org; Tue, 30 Jul 2024 19:59:05 -0400 Received: from mail.envs.net ([5.199.136.28]:40066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYwkB-0004Rp-KB for 72299-done@debbugs.gnu.org; Tue, 30 Jul 2024 19:59:04 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 3F2FD38A39D2; Tue, 30 Jul 2024 23:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1722383928; bh=eRbxQIB2d81rKLRd23qU46LUFWKtsWsuw+7HL+gSdhc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=jxPh8NxsLLbLGNjhs/XkCjjjeEezOULjhQXSYLKD6TeKvVeCeUSmTztClQaGREI8m qhbjjIVZSCkbjWV9vCfejNce4CAn9mq7K6KxLdwkFdBjeu694jmnLGP3nzt7GX1Fbe ZnS0uPJhfU/t/CsdleYbqWZZ6najoEoPwoEh0e3XjBYafqBQkk6lHg7lK22UnX2Hf2 4qx5a+MwRvqNVrkuKnMpTiPhFKeHRDSEeCiEidlqCtsRZqiMTfQMJKu5BDwrpaNfkL yeRA0mhxXPMdK/Hk+il3ycK0jxW029TfyrvwvC6U16JHNnhMDXbuRcF1ttFWuBruL9 aILgpyWkgHKS/gY+rWvyu4BXz9MHQ4tcdpfDU6iaNrGwMOfpG77QQxZWZHibolhO+U w8JI5NfzCQ9yPvGEla0bInNsjze4DIDpyXvnMcmMbJkwXzvFK51edX0Hz+fpVqfrcm Mteed/nxQB/sK9mn/sph9Bg+cHNrweEjywRPCkAh75/Fb9Hzndj3pBAUjU/TwyAU06 LrsoWBLs97yR2ZI4rTsoa8zeGegLSYXaGQgSsT2vxKb96AbnTnlRTCbHaBw8jk9cHn sFup3J4bQXoB1DIVrqimj+L4qM2Woj/eOKKEBv13moeou6sa8SzWHR11sDeKGX9oEe QuZmv8fuhzUCCtp8YTSCTsmo= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id HUWAy-UIoTCh; Tue, 30 Jul 2024 23:58:45 +0000 (UTC) Received: from localhost (unknown [223.90.216.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 30 Jul 2024 23:58:44 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 901424ae; Tue, 30 Jul 2024 23:59:14 +0000 (UTC) From: =?utf-8?B?5a6L5paH5q2m?= To: Suhail Singh Subject: Re: [bug#72299] [PATCH v3] gnu: Add git-tools. In-Reply-To: (Suhail Singh's message of "Tue, 30 Jul 2024 01:05:56 -0400") References: Date: Wed, 31 Jul 2024 07:59:14 +0800 Message-ID: <87sevq77ot.fsf@envs.net> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72299-done Cc: 72299-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Suhail Singh writes: > * gnu/packages/version-control.scm (git-tools): New variable. > > Change-Id: I0ac65c24f787714fe0ef234fce639c6ec561600d Pushed to master as commit dae712644d05723999c80a518b5f15d78ae317f2, thank you! From unknown Mon Jun 23 05:59:18 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 28 Aug 2024 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator