1. 12 Apr, 2018 1 commit
    • attr_file: fix handling of directory patterns with trailing spaces · 251d8771
      When comparing whether a path matches a directory rule, we pass the
      both the path and directory name to `fnmatch` with
      `GIT_ATTR_FNMATCH_DIRECTORY` being set. `fnmatch` expects the pattern to
      contain no trailing directory '/', which is why we try to always strip
      patterns of trailing slashes. We do not handle that case correctly
      though when the pattern itself has trailing spaces, causing the match to
      fail.
      
      Fix the issue by stripping trailing spaces and tabs for a rule previous
      to checking whether the pattern is a directory pattern with a trailing
      '/'. This replaces the whitespace-stripping in our ignore file parsing
      code, which was stripping whitespaces too late. Add a test to catch
      future breakage.
      Patrick Steinhardt committed
  2. 29 Oct, 2017 1 commit
  3. 25 Aug, 2017 2 commits
    • ignore: honor case insensitivity for negative ignores · 2d9ff8f5
      When computing negative ignores, we throw away any rule which does not
      undo a previous rule to optimize. But on case insensitive file systems,
      we need to keep in mind that a negative ignore can also undo a previous
      rule with different case, which we did not yet honor while determining
      whether a rule undoes a previous one. So in the following example, we
      fail to unignore the "/Case" directory:
      
          /case
          !/Case
      
      Make both paths checking whether a plain- or wildcard-based rule undo a
      previous rule aware of case-insensitivity. This fixes the described
      issue.
      Patrick Steinhardt committed
    • ignore: keep negative rules containing wildcards · b8922fc8
      Ignore rules allow for reverting a previously ignored rule by prefixing
      it with an exclamation mark. As such, a negative rule can only override
      previously ignored files. While computing all ignore patterns, we try to
      use this fact to optimize away some negative rules which do not override
      any previous patterns, as they won't change the outcome anyway.
      
      In some cases, though, this optimization causes us to get the actual
      ignores wrong for some files. This may happen whenever the pattern
      contains a wildcard, as we are unable to reason about whether a pattern
      overrides a previous pattern in a sane way. This happens for example in
      the case where a gitignore file contains "*.c" and "!src/*.c", where we
      wouldn't un-ignore files inside of the "src/" subdirectory.
      
      In this case, the first solution coming to mind may be to just strip the
      "src/" prefix and simply compare the basenames. While that would work
      here, it would stop working as soon as the basename pattern itself is
      different, like for example with "*x.c" and "!src/*.c. As such, we
      settle for the easier fix of just not optimizing away rules that contain
      a wildcard.
      Patrick Steinhardt committed
  4. 17 May, 2017 1 commit
  5. 17 Feb, 2017 2 commits
  6. 19 Apr, 2016 1 commit
    • ignore: fix directory limits when searching for star-star · 1c3018eb
      In order to match the star-star, we disable the flag that's looking for
      a single path element, but that leads to searching for the pattern in
      the middle of elements in the input string.
      
      Mark when we're handing a star-star so we jump over the elements in our
      attempt to match the part of the pattern that comes after the star-star.
      
      While here, tighten up the check so we don't allow invalid rules
      through.
      Carlos Martín Nieto committed
  7. 18 Apr, 2016 1 commit
  8. 02 Apr, 2016 1 commit
  9. 13 May, 2015 1 commit
  10. 12 May, 2015 3 commits
  11. 23 Apr, 2015 1 commit
  12. 02 May, 2014 1 commit
    • Improve handling of fake home directory · 0f603132
      There are a few tests that set up a fake home directory and a
      fake GLOBAL search path so that we can test things in global
      ignore or attribute or config files.  This cleans up that code to
      work more robustly even if there is a test failure.  This also
      fixes some valgrind warnings where scanning search paths for
      separators could end up doing a little bit of sketchy data access
      when coming to the end of search list.
      Russell Belfer committed
  13. 01 May, 2014 1 commit
  14. 18 Apr, 2014 1 commit
  15. 14 Apr, 2014 1 commit
    • Fix core.excludesfile named .gitignore · a9528b8f
      Ignore rules with slashes in them are matched using FNM_PATHNAME
      and use the path to the .gitignore file from the root of the
      repository along with the path fragment (including slashes) in
      the ignore file itself.  Unfortunately, the relative path to the
      .gitignore file was being applied to the global core.excludesfile
      if that was also named ".gitignore".
      
      This fixes that with more precise matching and includes test for
      ignore rules with leading slashes (which were the primary example
      of this being broken in the real world).
      
      This also backports an improvement to the file context logic from
      the threadsafe-iterators branch where we don't rely on mutating
      the key of the attribute file name to generate the context path.
      Russell Belfer committed
  16. 06 Apr, 2014 1 commit
  17. 05 Apr, 2014 1 commit
  18. 14 Nov, 2013 1 commit
  19. 29 May, 2013 1 commit
  20. 24 May, 2013 1 commit
    • Add ~ expansion to global attributes and excludes · 7a5ee3dc
      This adds ~/ prefix expansion for the value of core.attributesfile
      and core.excludesfile, plus it fixes the fact that the attributes
      cache was holding on to the string data from the config for a long
      time (instead of making its own strdup) which could have caused a
      problem if the config was refreshed.  Adds a test for the new
      expansion capability.
      Russell Belfer committed
  21. 22 Feb, 2013 2 commits