Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: b9a041c962af
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d62a642a7971
Choose a head ref
  • 5 commits
  • 1 file changed
  • 4 contributors

Commits on Aug 11, 2017

  1. git: add missing deps for filter-branch etc (#27221)

    Several git commands are implemented as shell scripts that run awk, sed, grep
    and perl. There is some existing patching in the postinstall for perl to rewrite
    it to an absolute reference to pkgs.perl, but several other packages are both
    missing as a dependency and have no rewrite logic.
    
    In particular git filter-branch depends on sed and grep.
    
    Additionally, the perl logic also seds git-am, which is now a binary not a shell
    script anymore (see <github.com/git/git/blob/master/builtin/am.c>), so this part
    was obsolete.
    
    I tested this by grepping all shell scripts for the relevant commands and then
    comparing the diffs of the new version to what is produced in master. All
    changes in the scripts seem good to me.
    
    (cherry picked from commit 2c1097a)
    aschmolck authored and NeQuissimus committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    7badaca View commit details
    Browse the repository at this point in the history
  2. git: 2.13.2 -> 2.13.3

    (cherry picked from commit eb5263a)
    NeQuissimus committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    23c659f View commit details
    Browse the repository at this point in the history
  3. git: 2.13.3 -> 2.13.4

    (cherry picked from commit ae73a17)
    NeQuissimus committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    34601e7 View commit details
    Browse the repository at this point in the history
  4. git: 2.13.4 -> 2.14.0

    (cherry picked from commit dc74b1a)
    mimame authored and NeQuissimus committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    d658937 View commit details
    Browse the repository at this point in the history
  5. git: 2.14.0 -> 2.14.1

    The new version contains a security fix for CVE-2017-1000117
    
    More information regarding this update can be found here:
    http://marc.info/?l=git&m=150238802328673&w=2
    
    (cherry picked from commit 4a0efc9)
    infinisil authored and NeQuissimus committed Aug 11, 2017
    1 Configuration menu
    Copy the full SHA
    d62a642 View commit details
    Browse the repository at this point in the history