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: 26cd7bb90bd3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: fddd90e9eaf7
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Jul 15, 2018

  1. fetchpatch: Add includes to compliment excludes, and require that bot…

    …h not be non-empty.
    
    This commit was originally introduced as part of #41420 and then
    reverted with the rest of that PR. However there was no reason to revert
    his particular commit.
    Ericson2314 authored and timokau committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    aa6adfc View commit details
    Browse the repository at this point in the history
  2. fetchpatch: escape excludes and includes

    Excludes and includes are implemented by passing the parameters to the
    respective flags of `filterdiff`. Those were passed unescaped until now.
    Since those flags expect patterns (similar to shell globs), something
    like `/some/path/*` might be used to exclude or include all files in
    some path. Without escaping the shell would expand the `*`, leading to
    unexpected behaviour.
    timokau committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    1ddab0e View commit details
    Browse the repository at this point in the history
  3. fetchpatch: fail on empty patch

    Since this is probably never the desired case and has led to actual
    issues, see the comments at:
    
    af1313e
    
    This might also happen when pulling a patch from GitHub or a similar web
    interface without explicitly selecting the "raw" format.
    timokau committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    8f9b985 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2018

  1. Configuration menu
    Copy the full SHA
    3058513 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2018

  1. Merge pull request #43538 from timokau/fetchpatch-fix

    fetchpatch: quote excludes
    matthewbauer committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    fddd90e View commit details
    Browse the repository at this point in the history