about summary refs log tree commit diff
path: root/pkgs/applications/version-management/git-and-tools/git
Commit message (Collapse)AuthorAge
* git: 2.26.1 -> 2.26.2 (security, CVE-2020-11008)Michael Weiss2020-04-22
| | | | See: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.17.5.txt
* Merge master into staging-nextFrederik Rietdijk2020-04-21
|\
| * git: Fix the update.sh script and use HTTPSMichael Weiss2020-04-21
| | | | | | | | | | | | | | | | | | | | | | The syntax is ${parameter:-word} (i.e. previously this used "latestTag" instead of the actual value). (Fixes a regression from #85278.) Also: Even though getting the latest tag isn't really security critical (as long as Git itself is secure against untrusted input), I'd prefer to switch from the Git to the HTTPS protocol (for authentication of the server and encryption + uses a standard port).
* | Merge staging-next into stagingFrederik Rietdijk2020-04-21
|\|
| * Merge #85263: git: 2.25.1 -> 2.26.1 (into staging-next)Vladimír Čunát2020-04-16
| |\
| | * git: 2.25.1 -> 2.26.1James Ottaway2020-04-15
| | | | | | | | | | | | | | | | | | This version addresses CVE-2020-5260. See https://lore.kernel.org/lkml/xmqqy2qy7xn8.fsf@gitster.c.googlers.com/
* | | gitAndTools.gitFull: 2.25.1 -> 2.25.2R. RyanTM2020-04-21
| | |
* | | Merge branch 'staging-next' into stagingJan Tojnar2020-04-16
|\| |
| * | git: Allow the update script to target non-latest versionsJames Ottaway2020-04-15
| |/ | | | | | | | | This came in handy when I wanted to bump a patch version while avoiding a new minor version.
* | Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020Matthew Bauer2020-04-13
|\ \ | |/ |/| Cross compilation fixes [april 2020]
| * git: fix cross compilationMatthew Bauer2020-04-06
| |
* | treewide: Per RFC45, remove all unquoted URLsMichael Reilly2020-04-10
|/
* git: use tcl/tk from nixpkgs on darwinAndrew Childs2020-03-02
|
* Revert "git: Fix git-gui to work on Catalina"Andrew Childs2020-03-02
| | | | This reverts commit 1b6ef1268fa87d66125938399a42f2b4d416cd8f.
* Merge staging-next into stagingFrederik Rietdijk2020-02-27
|\
| * git: 2.25.0 -> 2.25.1Tim Steinbach2020-02-20
| |
* | Merge pull request #77071 from peterhoeg/git_emacs_filesPeter Hoeg2020-02-23
|\ \ | |/ |/| git: upstream no longer ships .el files for emacs
| * git: upstream no longer ships .el files for emacsPeter Hoeg2019-12-31
| |
* | git: Fix git-gui to work on CatalinaDave Nicponski2020-02-10
| | | | | | | | | | | | The existing post-install was not successfully patching the git-gui script, and thus was invoking the packaged osx app which uses the system tk, which is too old to work (and is no longer supported by Apple anyway).
* | git: enable zsh completionBenjamin Esham2020-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Git ships with a zsh completion script, but this script was previously only available at $out/share/git/contrib/completion/git-completion.zsh, which is not a path (or a filename) that would be discovered by a typical zsh installation. This commit symlinks that file to $out/share/zsh/site-functions/_git, which is a more standard location. That zsh completion script is mostly a wrapper around the Bash completion script, so this commit also patches the former so that it can "find" the latter.
* | git: 2.24.1 -> 2.25.0Tim Steinbach2020-01-13
| |
* | treewide: installFlags is a listRobin Gloster2019-12-30
|/
* Merge master into staging-nextFrederik Rietdijk2019-12-13
|\
| * Merge pull request #75406 from andersk/gitk-completionWout Mertens2019-12-11
| |\ | | | | | | git: Install bash-completion symlink for gitk
| | * git: Install bash-completion symlink for gitkAnders Kaseorg2019-12-09
| | | | | | | | | | | | | | | | | | | | | | | | Since bash-completion rules are loaded dynamically, the completion rules for `gitk <Tab>` waere not being loaded until the user first typed `git <Tab>`. Fix this by adding a symlink named `gitk`. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
| * | git: 2.24.0 -> 2.24.1edef2019-12-11
| | | | | | | | | | | | | | | | | | | | | | | | CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, CVE-2019-19604 Link: https://lore.kernel.org/git/xmqqr21cqcn9.fsf@gitster-ct.c.googlers.com/
* | | Merge staging-next into stagingFrederik Rietdijk2019-12-10
|\| |
| * | git: Add git to update scriptTim Steinbach2019-12-10
| | | | | | | | | | | | | | | Otherwise the system's git will be used, which may not exist or, as is the case with Ubuntu, not have the --sort flag for ls-remote.
* | | git: enable some of previously broken testsKonrad Borowski2019-11-29
|/ /
* | Merge pull request #74213 from ruuda/fix-git-perl-supportWout Mertens2019-11-28
|\ \ | | | | | | git: fix the "perlSupport = false" configuration
| * | git: fix the "perlSupport = false" configurationRuud van Asseldonk2019-11-27
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When perlSupport = false, we will set NO_PERL=1, and build Git without Perl support. This is a build option that Git supports. However, Git's test suite still requires a Perl to be available to run the tests, and we did not provide one. The tests respect PERL_PATH, and if it is not set, they default to /usr/bin/perl. Before this commit, if we set "perlSupport = false", then no Perl would be available to the package, and so the tests would default to /usr/bin/perl. When building without a sandbox, that could still work, even though there is no "perl" on the path, because the tests defaulted to an absolute path. You can reproduce this issue as follows: nix-build -E 'let pkgs = (import ./default.nix) {}; in pkgs.git.override { perlSupport = false; }' I just ran into this when trying to build pkgs.git from an old version of Nixpkgs that I was able to build just fine in the past, and today it would not build any more, complaining when running the tests: make -C t/ all make[1]: Entering directory '/build/git-2.18.0/t' rm -f -r 'test-results' /nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash: /usr/bin/perl: No such file or directory In the past the sandbox was not enabled by default, so then it worked for me. But now that it is enabled, my host's (not NixOS) /usr/bin/perl is no longer accessible, and the build fails. The solution is to explicitly set PERL_PATH when running the tests. This *almost* works, except that there appears to be a bug in the test for "git request-pull". That command is a Bash script that calls Perl at some point, so it requires Perl, and therefore it cannot be supported when NO_PERL=1. But that particular test does not check whether Git was compiled with Perl support (other tests do include that check), and that makes the test fail: t5150-request-pull.sh .............................. not ok 4 - pull request after push not ok 5 - request asks HEAD to be pulled not ok 6 - pull request format not ok 7 - request-pull ignores OPTIONS_KEEPDASHDASH poison not ok 9 - pull request with mismatched object not ok 10 - pull request with stale object Dubious, test returned 1 (wstat 256, 0x100) Failed 6/10 subtests This output makes sense if you look at t5150-request-pull.sh. Test 1 and 2 are setup steps. Test 3 does call request-pull, but it expects the command to fail, and it cannot distinguish between the command exiting with a nonzero exit code, or failing to start it at all. So test 3 passes for the wrong reasons. Test 4 through 10 all call request-pull, so they fail. The quick workaround here is to disable the test. I will look into upstreaming a patch that makes the test skip itself when Perl is disabled.
* / git: build with python3Jörg Thalheim2019-11-28
|/ | | | | | git-p4 seems to be python3 ready: https://github.com/git/git/blob/master/git-p4.py#L32
* Merge remote-tracking branch 'upstream/master' into wrapper-pname-supportJohn Ericson2019-11-24
|\
| * git: disable failing test on darwinDaiderd Jordan2019-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | The tests for null patterns where changed in 25754125cef278c7e9492fbd6dc4a28319b01f18, it's possible utf-8 normalisation is causing different behaviour here. not ok 54 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[Ð]' a not ok 57 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>Ð' a not ok 60 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a not ok 63 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>Ð' a Dubious, test returned 1 (wstat 256, 0x100) Failed 4/145 subtests (less 48 skipped subtests: 93 okay)
| * git: 2.23.0 -> 2.24.0Tim Steinbach2019-11-04
| |
| * git: drop extraneous sysconfdir trailing slashAlyssa Ross2019-11-03
| | | | | | | | | | | | I noticed while strace-ing that Git was trying to open /etc//gitconfig. Not a big deal, but it is definitely more correct without the trailing slash.
| * Merge pull request #68366 from sorbits/git-bash-completionMatthew Bauer2019-09-18
| |\ | | | | | | Install git’s bash completion so that it is loaded on demand
| | * Install git’s bash completion so that it is loaded on demandAllan Odgaard2019-09-09
| | | | | | | | | | | | | | | | | | Putting the file in $out/share/bash-completion/completions means that it will be loaded on demand by nixpkgs.bash-completion. With the old location, the user would either have to explicitly source the file during bash startup, or set BASH_COMPLETION_COMPAT_DIR before sourcing bash_completion.sh, which will eagerly load everything in that directory.
* | | treewide: Get rid of most `parseDrvName` without breaking compatJohn Ericson2019-11-24
|/ / | | | | | | | | That is because this commit should be merged to both master and release-19.09.
* | Merge staging-next into stagingFrederik Rietdijk2019-08-28
|\|
| * Merge branch 'master' into staging-nextVladimír Čunát2019-08-24
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
| | * treewide: update globin's maintained drvsRobin Gloster2019-08-20
| | |
* | | git: 2.22.1 -> 2.23.0Izorkin2019-08-18
|/ /
* | treewide: name -> pnamevolth2019-08-17
| |
* | git: 2.22.0 -> 2.22.1Tim Steinbach2019-08-13
|/
* Merge pull request #53494 from kirelagin/git-instawebWout Mertens2019-08-04
|\ | | | | git, gitweb: Fix git-instaweb
| * git: Do not split gitweb outputKirill Elagin2019-01-06
| | | | | | | | | | | | This partially reverts 9029ed933c69287c64a30d40b6b4f9f1ace7dd94 as `git-instaweb`, which comes with git, needs on gitweb and having them in separate outputs results in a cycle.
| * git, gitweb: Fix git-instawebKirill Elagin2019-01-06
| | | | | | | | | | | | | | * Make the build system embed the correct path to gitweb into git-instaweb * Move gitweb fixups to the git expression, to make sure that gitweb used by git-instaweb is functional * This will increase the closure size of git, but only with perlSupport
* | git: remove runtime dependency on gccDemin Dmitriy2019-07-17
| | | | | | | | | | | | | | | | | | | | Reduces gitMinimal closure size from 329.6M to 174.8M. Fixes the issue https://github.com/NixOS/nixpkgs/issues/64350. In git 2.22.0 git-stash is no longer a shell script and now it is just a symlink to git. `postInstall` assumed that it was a shell script, tried to patch it and ended up corrupting the file and made `strip` refuse stripping it.
* | Merge pull request #56069 from delroth/git-diff-highlightPeter Simons2019-06-14
|\ \ | | | | | | git: build diff-highlight if Perl support is enabled
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-31 02:26:06 +0000