diff options
| author | Vicent Marti <vicent@github.com> | 2014-04-23 03:21:05 -0700 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-04-23 03:21:05 -0700 |
| commit | 5b58d6f78cf8346445374eaf5cde0f54be5c5796 (patch) | |
| tree | efc60e0cbdf2ff1614fb1bcbfd7faedb09d758c4 /src/diff_print.c | |
| parent | a32d684f866e7710fd139d69ad5d1a8d0ae527c4 (diff) | |
| parent | e60883c82f1c4d44be856e545b4cbeea27522416 (diff) | |
| download | libgit2-5b58d6f78cf8346445374eaf5cde0f54be5c5796.tar.gz | |
Merge pull request #2289 from libgit2/rb/note-git-diff-index-behavior
Some doc and examples/diff.c changes
Diffstat (limited to 'src/diff_print.c')
| -rw-r--r-- | src/diff_print.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/diff_print.c b/src/diff_print.c index a7f7b6fe8..ee5cd8dfb 100644 --- a/src/diff_print.c +++ b/src/diff_print.c @@ -175,7 +175,8 @@ static int diff_print_one_raw( git_oid_tostr(end_oid, pi->oid_strlen, &delta->new_file.id); git_buf_printf( - out, ":%06o %06o %s... %s... %c", + out, (pi->oid_strlen <= GIT_OID_HEXSZ) ? + ":%06o %06o %s... %s... %c" : ":%06o %06o %s %s %c", delta->old_file.mode, delta->new_file.mode, start_oid, end_oid, code); if (delta->similarity > 0) |