diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-13 21:43:58 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-13 21:43:58 +0200 |
| commit | 16d742ebdb91492b784555cb528408531995634c (patch) | |
| tree | 1ea3600aa1caacfbb825a370556fbb8688cdfa20 /src/attr.c | |
| parent | cd430bc786877794b820b045ce610d2ac78036b3 (diff) | |
| parent | 882cc37f8360ef3a3d4dd60621f78375337df25f (diff) | |
| download | libgit2-16d742ebdb91492b784555cb528408531995634c.tar.gz | |
Merge pull request #3119 from ethomson/ignore
Attributes: don't match files for folders
Diffstat (limited to 'src/attr.c')
| -rw-r--r-- | src/attr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/attr.c b/src/attr.c index 102d0248c..d43a15f50 100644 --- a/src/attr.c +++ b/src/attr.c @@ -309,7 +309,8 @@ static int attr_setup(git_repository *repo, git_attr_session *attr_session) if (error == 0) error = preload_attr_file( repo, attr_session, GIT_ATTR_FILE__FROM_FILE, NULL, sys.ptr); - else if (error != GIT_ENOTFOUND) + + if (error != GIT_ENOTFOUND) return error; git_buf_free(&sys); |