diff options
| author | Alan Rogers <alan@github.com> | 2014-05-20 23:57:40 +1000 |
|---|---|---|
| committer | Alan Rogers <alan@github.com> | 2014-05-20 23:57:40 +1000 |
| commit | 61bef72dc35c593e632dc2008c4eec271a264869 (patch) | |
| tree | e85096c82d51a1dc81d529b627fb7504c1059d29 /src/diff_tform.c | |
| parent | f47bc8ff5e844fec15e705e8ebd11bae742b8039 (diff) | |
| download | libgit2-61bef72dc35c593e632dc2008c4eec271a264869.tar.gz | |
Start adding GIT_DELTA_UNREADABLE and GIT_STATUS_WT_UNREADABLE.
Diffstat (limited to 'src/diff_tform.c')
| -rw-r--r-- | src/diff_tform.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/diff_tform.c b/src/diff_tform.c index a2dab0ae2..423a0ca33 100644 --- a/src/diff_tform.c +++ b/src/diff_tform.c @@ -114,7 +114,7 @@ static git_diff_delta *diff_delta__merge_like_cgit_reversed( if ((dup = diff_delta__dup(a, pool)) == NULL) return NULL; - if (b->status == GIT_DELTA_UNMODIFIED || b->status == GIT_DELTA_UNTRACKED) + if (b->status == GIT_DELTA_UNMODIFIED || b->status == GIT_DELTA_UNTRACKED || b->status == GIT_DELTA_UNREADABLE) return dup; if (dup->status == GIT_DELTA_DELETED) { @@ -732,6 +732,7 @@ static bool is_rename_source( switch (delta->status) { case GIT_DELTA_ADDED: case GIT_DELTA_UNTRACKED: + case GIT_DELTA_UNREADABLE: case GIT_DELTA_IGNORED: return false; @@ -786,6 +787,7 @@ GIT_INLINE(bool) delta_is_new_only(git_diff_delta *delta) { return (delta->status == GIT_DELTA_ADDED || delta->status == GIT_DELTA_UNTRACKED || + delta->status == GIT_DELTA_UNREADABLE || delta->status == GIT_DELTA_IGNORED); } |