diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-23 23:52:03 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-23 23:52:03 -0400 |
| commit | cc605e73acad8b665c3b89a645eae9de4299774b (patch) | |
| tree | e8430d68e5cde36cefc94b83191218f5b651162b /src/diff.c | |
| parent | 09f3364d7a9fd061e3c624a1f7b118b312fd825c (diff) | |
| parent | 8d8a2eefef0fbb42d7a7fb8f88ca7481515e2737 (diff) | |
| download | libgit2-cc605e73acad8b665c3b89a645eae9de4299774b.tar.gz | |
Merge pull request #3222 from git-up/conflicted
Fixed GIT_DELTA_CONFLICTED not returned in some cases
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/diff.c b/src/diff.c index cc93f57cd..12d34a184 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1090,8 +1090,10 @@ static int handle_unmatched_new_item( /* item contained in ignored directory, so skip over it */ return iterator_advance(&info->nitem, info->new_iter); - else if (info->new_iter->type != GIT_ITERATOR_TYPE_WORKDIR) - delta_type = GIT_DELTA_ADDED; + else if (info->new_iter->type != GIT_ITERATOR_TYPE_WORKDIR) { + if (delta_type != GIT_DELTA_CONFLICTED) + delta_type = GIT_DELTA_ADDED; + } else if (nitem->mode == GIT_FILEMODE_COMMIT) { /* ignore things that are not actual submodules */ |