Skip to content

Fix a few bugs in etc/gitignore #29

wants to merge 50 commits into from

3 participants

aroben commented Jun 11, 2012

There were two bugs in etc/gitignore that I noticed:

  1. Some patterns had trailing whitespace, which basically made them not work.
  2. We had a bunch of extraneous ** in our patterns, which were causing those patterns to match fewer things than they should have.
paulcbetts and others added some commits Jan 27, 2012
@paulcbetts paulcbetts Make our version of Portable Git use our cred helper 812ebd7
@paulcbetts paulcbetts Add gitattribute tweaks to help C# developers 571c1e3
@paulcbetts paulcbetts Add awesome Windows-based gitignore based on github/gitignore 24144be
@paulcbetts paulcbetts Make sure GitPad is the default editor b15ad71
@paulcbetts paulcbetts Make sure images are binary 6c95b4a
@paulcbetts paulcbetts Enable GHCleanSmudge dc093f4
@paulcbetts paulcbetts Disable autocrlf 132d769
@paulcbetts paulcbetts Disable GHCleanSmudge for now until we can make it faster 606b3b2
@paulcbetts paulcbetts Make sure we don't throw SSH host verfication dialogs 1d639c1
@paulcbetts paulcbetts Merge commit 'f5f7760711e3c9a3f04de3163bed0c07288e3d54' into ghfw e20ff4a
@paulcbetts paulcbetts Ensure less uses UTF8 encoding 9883da8
@paulcbetts paulcbetts Set autocrlf = true until we can enable GHCleanSmudge e96a9f5
@paulcbetts paulcbetts Add a SSH wrapper script that will never prompt for a password 09c23f7
@paulcbetts paulcbetts Mark most source file formats as text 202ec06
@paulcbetts paulcbetts SLN files must be CRLF or else VS Version Selector app dies :-/ 32482a0
@paulcbetts paulcbetts Move config file to the right place 59985d3
@paulcbetts paulcbetts Make sure that we use the GitHub key for .com, even if ssh-agent is b…
@paulcbetts paulcbetts Add configurations for different merge tools 43007d0
@paulcbetts paulcbetts Update gitignore to catch more stuff ef3e533
@paulcbetts paulcbetts Make 'git push' only push the current branch 10da2ed
@paulcbetts paulcbetts These two files *must* have *nix line endings c532bb6
@paulcbetts paulcbetts Some C# files are UTF-16, don't corrupt them 5f64c42
@aroben aroben Merge remote-tracking branch 'aroben/copy-files-error-checking' into …
@aroben aroben Don't include git-cheetah in portable releases
It's pretty unlikely that anyone would install git-cheetah out of a
portable release.
@aroben aroben Make sure zlib-config.patch always has LF line endings
LF is required for this patch to apply.
@aroben aroben Teach about NO_COMPRESS
If this environment variable is set, will just leave
the uncompressed Portable Git distribution sitting in /tmp/WinGit.
@aroben aroben Add
This script builds a Portable Git distribution and commits it to the
PortableGit branch. This is useful for updating the version of msysGit we
ship with GitHub for Windows.
@aroben aroben Merge remote-tracking branch 'upstream/devel' into devel a2523de
Paul Betts Fix typo in .sln line a4c48e9
@tclem tclem Change how we ship system gitattributes 51081c4
@aroben aroben Change the README to describe our build process c9f6aa0
@aroben aroben Make sure to include etc/gitattributes-suggested in the build 862136f
@aroben aroben Make `NO_SFX=1` work again 8423872
@aroben aroben Merge branch 'fix-nosfx' into devel f3b6309
@aroben aroben Include PortableGit.7z in the PortableGit branch
This way consumers of this branch won't have to recompress the portable
Git distribution.
@aroben aroben Include a VERSION file in PortableGit.7z
This file records the SHA1 from which the portable Git release was
@tclem tclem Some new ideas for global gitattributes ae3c26e
@tclem tclem No longer distributing this 674e46a
@tclem tclem This seems to be breaking local gitattributes afd88c3
@tclem tclem Back to * text=auto now that I understand gitattributes cant have BOM b71ffab
@tclem tclem Good to describe what this line does ed1940d
@aroben aroben Merge pull request #1 from github/include-zipped-distro
Include PortableGit.7z on the PortableGit branch
@aroben aroben Merge branch 'devel' of into devel fb8ef35
@aroben aroben Merge pull request #2 from github/update-to-upstream
Update to upstream
@aroben aroben Fix Git commands when installed in a Unicode path 53021fe
@aroben aroben Merge pull request #3 from github/git-unicode-path-compat
Fix Git commands when installed in a Unicode path
@aroben aroben Fix execution of non-.exe external git commands d021a85
@aroben aroben Merge pull request #4 from github/git-unicode-path-compat
Fix execution of non-.exe external git commands
@aroben aroben Remove trailing spaces from etc/gitignore
These can cause the ignore rules not to function correctly.
@aroben aroben Remove a bunch of extraneous ** from patterns in etc/gitignore
These were added in ef3e533, but they
are hurting, not helping. Consider the following patterns:


The first will match all directories named "foo" (and anything inside
them) no matter where they reside in the repository.

The second will match directories named "foo" (and anything inside
them), but only if they are below the .gitignore in the directory

The third will match anything inside all directories named "foo".

Because Git only tracks files, not directories, the first and third
patterns are essentially equivalent. Since the first is simpler, we
should prefer it.

The second pattern can be useful in some cases, but as far as I can tell
it is not actually desired in any of the cases where we are currently
using it.

So, I've replaced all instances of patterns 2 and 3 above with pattern
aroben commented Jun 11, 2012

Whoops, wrong target branch. Sorry for the noise!

@aroben aroben closed this Jun 11, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.