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_print.c | |
| parent | f47bc8ff5e844fec15e705e8ebd11bae742b8039 (diff) | |
| download | libgit2-61bef72dc35c593e632dc2008c4eec271a264869.tar.gz | |
Start adding GIT_DELTA_UNREADABLE and GIT_STATUS_WT_UNREADABLE.
Diffstat (limited to 'src/diff_print.c')
| -rw-r--r-- | src/diff_print.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/diff_print.c b/src/diff_print.c index 08e1e7f90..964c49540 100644 --- a/src/diff_print.c +++ b/src/diff_print.c @@ -82,14 +82,15 @@ char git_diff_status_char(git_delta_t status) char code; switch (status) { - case GIT_DELTA_ADDED: code = 'A'; break; - case GIT_DELTA_DELETED: code = 'D'; break; - case GIT_DELTA_MODIFIED: code = 'M'; break; - case GIT_DELTA_RENAMED: code = 'R'; break; - case GIT_DELTA_COPIED: code = 'C'; break; - case GIT_DELTA_IGNORED: code = 'I'; break; - case GIT_DELTA_UNTRACKED: code = '?'; break; - default: code = ' '; break; + case GIT_DELTA_ADDED: code = 'A'; break; + case GIT_DELTA_DELETED: code = 'D'; break; + case GIT_DELTA_MODIFIED: code = 'M'; break; + case GIT_DELTA_RENAMED: code = 'R'; break; + case GIT_DELTA_COPIED: code = 'C'; break; + case GIT_DELTA_IGNORED: code = 'I'; break; + case GIT_DELTA_UNTRACKED: code = '?'; break; + case GIT_DELTA_UNREADABLE: code = 'X'; break; + default: code = ' '; break; } return code; @@ -414,6 +415,7 @@ static int diff_print_patch_file( if (S_ISDIR(delta->new_file.mode) || delta->status == GIT_DELTA_UNMODIFIED || delta->status == GIT_DELTA_IGNORED || + delta->status == GIT_DELTA_UNREADABLE || (delta->status == GIT_DELTA_UNTRACKED && (pi->flags & GIT_DIFF_SHOW_UNTRACKED_CONTENT) == 0)) return 0; |