summaryrefslogtreecommitdiff
path: root/guix/build/git.scm
AgeCommit message (Collapse)Author
2026-02-26build: Patch the git-lfs hooks shebangs in `git-fetch'.Maxim Cournoyer
This reverts commit b6a070d2a3c059c1a574dc4048fb8f942e008799, which patched git-lfs so its hooks would refer to a 'sh' from the store, but this reference was at risk of going stale since the hooks are installed and preserved outside the store. The shebangs are now patched in the `git-fetch' procedure directly. * guix/scripts/perform-download.scm (perform-git-download): Expand comment. * guix/git-download.scm (bash-package): New variable. (git-fetch/in-band*): Add #:bash argument. (git-fetch-builder): Add it to `inputs', so that it gets added to PATH. * guix/build/git.scm (git-fetch): Substitute /bin/bash in the post-checkout git-lfs hook shebang. Fixes: https://codeberg.org/guix/guix/issues/5616 Reported-by: Simon Josefsson <simon@josefsson.org> Change-Id: Ife81737705bef5d0a1edad307ed77a479af4609e
2025-10-12build: git: prevent commit from being treated as a flag.Reepca Russelstein
Git's option parsing is more flexible than its command synopses would lead one to believe: they can apparently be passed even after positional arguments. Some of these options can be quite nasty if an attacker is able to choose them. Additionally, some commands offer no way of disambiguating the meaning of an argument. For example, "git checkout" has no way of specifying that an argument should be unconditionally treated as a commit specifier instead of, say, an option or a filespec. * guix/build/git.scm (git-fetch): pass "--" to every git invocation that includes non-constant strings. Explicitly reject commits that start with "-". Change-Id: I3b1707ff8f8544925d1549472f0bda7954249f89 Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2025-09-18Revert "Update Maxim's email address."Maxim Cournoyer
This reverts commit d0d87a744d724b7e7d5ac013c586039652087bb3. Oops! This caused a world rebuild. Change-Id: I25fff644b2b61d0ee93d69b457b04c72b5b74d15
2025-09-18Update Maxim's email address.Maxim Cournoyer
The change was automated via: git grep -l maxim.cournoyer@gmail.com | xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g' * .mailmap: New entry. Change-Id: Iaa88b1e51c94159c49138fb43910badb990eb169
2025-02-19guix: Fix some misspellings.Efraim Flashner
Change-Id: Ia036217dadc1624c5f0d59fd44f646d46315c1f3
2024-03-09download: Honor ‘GUIX_DOWNLOAD_METHODS’ environment variable.Ludovic Courtès
This replaces ‘GUIX_DOWNLOAD_FALLBACK_TEST’ and allows you to test various download methods, like so: GUIX_DOWNLOAD_METHODS=nar guix build guile-gcrypt -S --check GUIX_DOWNLOAD_METHODS=disarchive guix build hello -S --check * guix/build/download.scm (%download-methods): New variable. (download-method-enabled?): New procedure. (url-fetch): Define ‘initial-uris’; honor ‘download-method-enabled?’. Call ‘disarchive-fetch/any’ only when the 'disarchive method is enabled. * guix/build/git.scm (git-fetch-with-fallback): Honor ‘download-method-enabled?’. * guix/download.scm (%download-methods): New variable. (%download-fallback-test): Remove. (built-in-download): Add #:download-methods parameter and honor it. (url-fetch*): Pass #:content-addressed-mirrors and #:disarchive-mirrors unconditionally. * guix/git-download.scm (git-fetch/in-band*): Pass “git url” unconditionally. (git-fetch/built-in): Likewise. Pass “download-methods”. * guix/bzr-download.scm (bzr-fetch)[build]: Honor ‘download-method-enabled?’. Pass ‘GUIX_DOWNLOAD_METHODS’ to #:env-vars. * guix/cvs-download.scm (cvs-fetch)[build]: Honor ‘download-method-enabled?’. Pass ‘GUIX_DOWNLOAD_METHODS’ to #:env-vars. * guix/hg-download.scm (hg-fetch): Honor ‘download-method-enabled?’. Pass #:env-vars to ‘gexp->derivation’. * guix/scripts/perform-download.scm (perform-download): Honor “download-methods” from DRV. Parameterize ‘%download-methods’ before calling ‘url-fetch’. (perform-git-download): Likewise. * guix/svn-download.scm (svn-fetch): Honor ‘download-method-enabled?’. Pass ‘GUIX_DOWNLOAD_METHODS’ to #:env-vars. (svn-multi-fetch): Likewise. Change-Id: Ia3402e17f0303dfa964bdc761265efe8a1dd69ab
2024-03-09perform-download: Allow use of ‘download-nar’ for ‘--check’ builds.Ludovic Courtès
Previously, the nar fallback would always fail on ‘--check’ build because the output directory in that case is different from the store file name. This change fixes that. * guix/build/git.scm (git-fetch-with-fallback): Add #:item parameter and pass it to ‘download-nar’. * guix/scripts/perform-download.scm (perform-git-download): Pass #:item to ‘git-fetch-with-fallback’. Change-Id: I30fc948718e99574005150bba5215a51ef153c49
2024-02-12git-download: Download from SWH by nar hash when possible.Ludovic Courtès
* guix/build/git.scm (git-fetch-with-fallback): Add #:hash and #:hash-algorithm. Try ‘swh-download-directory-by-nar-hash’ before ‘swh-download’ when #:hash is provided. * guix/git-download.scm (git-fetch/in-band*): Pass #:hash and #:hash-algorithm to ‘git-fetch-with-fallback’. * guix/scripts/perform-download.scm (perform-git-download): Likewise. Change-Id: Ic875a7022fd78c9fac32e92ad4f8ce4d81646ec5
2023-11-07git-download: Add support for Git Large File Storage (LFS).Maxim Cournoyer
* guix/build/git.scm (git-fetch) [lfs?]: New argument, doc and setup code. (git-fetch-with-fallback) [lfs?]: New argument. Pass it to git-fetch. * guix/git-download.scm (git-lfs-package): New procedure. (git-fetch/in-band*): New procedure, made of the logic of git-fetch/in-band, with new git-lfs specifics, with the following changes: New #:git-lfs argument. <inputs>: Remove labels. Conditionally add git-lfs. <build>: Read "git lfs?" environment variable and pass its value to the #:lfs? argument of git-fetch-with-fallback. Use INPUTS directly; update comment. <gexp->derivation>: Add "git lfs?" to #:env-vars. (git-fetch/in-band): Express in terms of git-fetch/in-band*. (git-fetch/lfs): New procedure. * doc/guix.texi (origin Reference): Document it. Change-Id: I5b233b8642a7bdb8737b9d9b740e7254a89ccb25 Reviewed-by: Ludovic Courtès <ludo@gnu.org>
2023-09-26git-download: Move fallback code to (guix build git).Ludovic Courtès
* guix/build/git.scm (git-fetch-with-fallback): New procedure, with code taken from… * guix/git-download.scm (git-fetch): … here. [modules]: Remove modules that are no longer directly used in ‘build’. [build]: Use ‘git-fetch-with-fallback’.
2023-07-05guix: git: Set initial branch name for git-fetch.Efraim Flashner
This removes the 'hint' about choosing a branch name when creating a new git repository. * guix/build/git.scm (git-fetch): When running 'git init' add an initial branch name.
2019-01-06git-download: Use 'invoke'.Ludovic Courtès
* guix/build/git.scm (git-fetch): Use 'invoke' instead of 'system*' for "git submodule update".
2019-01-06git-download: 'git-fetch' really returns #f upon error.Ludovic Courtès
This allows the fallback code in (guix git-download) to actually run. Regression introduced in commit 329dabe13bf98b899b907b45565434c5140804f5. Fixes <https://bugs.gnu.org/33911>. Reported by Björn Höfling <bjoern.hoefling@bjoernhoefling.de>. * guix/build/git.scm (git-fetch): Guard against 'invoke-error?' and really return #f upon failure.
2018-10-28git-download: Print a message when falling back to a full fetch.Maxim Cournoyer
Otherwise the user might believe that git-fetch stalled, observing the lack of output following a 'fatal' git error message (see: https://debbugs.gnu.org/33100). * guix/build/git.scm (git-fetch): Print message when falling back to a full fetch.
2018-03-04git-download: Fetch only the required commit, if possible.Danny Milosavljevic
* guix/build/git.scm (git-fetch): Fetch only the required commit, if possible.
2016-01-05git-download: Correctly implement recursive checkouts.Ludovic Courtès
Previously, the 'git checkout' invocation would remove sub-modules that had been initialized by 'git clone --recursive'. * guix/build/git.scm (git-fetch): Never use "git clone --recursive". Invoke "git submodule update --init --recursive" after "git checkout". Remove '.git' directories as the last step.
2014-06-27git-download: Support recursive clones.Ludovic Courtès
* guix/git-download.scm (<git-reference>)[recursive?]: New field. (git-fetch): Add 'inputs' variable. Add it to the #:inputs argument of 'build-expression->derivation'. Augment builder with call to 'set-path-environment-variable', and pass #:recursive? to 'git-fetch'. * guix/build/git.scm (git-fetch): Add #:recursive? parameter. Pass --recursive when RECURSIVE? is true, and delete all the '.git' files.
2014-05-08git-download: Disable TLS certificate verification.Ludovic Courtès
* guix/build/git.scm (git-fetch): Add 'setenv' call.
2014-02-21Add (guix git-download).Ludovic Courtès
* guix/git-download.scm, guix/build/git.scm: New files. * Makefile.am (MODULES): Add them. * guix/packages.scm (<origin>): Fix comment for 'method' field.