diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-26 10:29:11 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-26 10:29:11 +0100 |
| commit | 77b699e0da3d4a4fed742893bd172f3ee7b936d5 (patch) | |
| tree | d99dc48da9b9105f955af24a0d7a763e9a7b5dea /src/iterator.c | |
| parent | fcbbe1bd82c5e50bcd4a8d31bb68df7fe662026b (diff) | |
| parent | d3bc95fd664095a0c8dfcdf99f62741b1ecd6ffc (diff) | |
| download | libgit2-77b699e0da3d4a4fed742893bd172f3ee7b936d5.tar.gz | |
Merge pull request #2205 from libgit2/rb/submodule-untracked-vs-ignored
Update behavior for untracked contained repositories
Diffstat (limited to 'src/iterator.c')
| -rw-r--r-- | src/iterator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/iterator.c b/src/iterator.c index 401b5de93..e9ec65250 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -1313,8 +1313,8 @@ static int workdir_iterator__update_entry(fs_iterator *fi) if (error < 0) giterr_clear(); - /* mark submodule (or any dir with .git) as GITLINK and remove slash */ - if (!error || error == GIT_EEXISTS) { + /* mark submodule as GITLINK and remove slash */ + if (!error) { fi->entry.mode = S_IFGITLINK; fi->entry.path[strlen(fi->entry.path) - 1] = '\0'; } |