diff options
| author | Carlos MartÃn Nieto <carlosmn@github.com> | 2017-01-13 17:05:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 17:05:58 +0100 |
| commit | a6d833a29e100cae66d5144367e9102d093d4dbd (patch) | |
| tree | e57dce696483b3c166535e75aefe0feedad6b0d8 /src/diff_generate.c | |
| parent | ffe259d9e52a472b172d9834ed44a98fd1ce4d1a (diff) | |
| parent | 8f0d5cdef9e2cb53c2f455d0a449f25c87647811 (diff) | |
| download | libgit2-a6d833a29e100cae66d5144367e9102d093d4dbd.tar.gz | |
Merge pull request #4049 from libgit2/ethomson/error_msgs
giterr_set: consistent error messages
Diffstat (limited to 'src/diff_generate.c')
| -rw-r--r-- | src/diff_generate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diff_generate.c b/src/diff_generate.c index 06f9b19c7..f6cc04fed 100644 --- a/src/diff_generate.c +++ b/src/diff_generate.c @@ -624,7 +624,7 @@ int git_diff__oid_for_entry( error = git_odb__hashlink(out, full_path.ptr); diff->base.perf.oid_calculations++; } else if (!git__is_sizet(entry.file_size)) { - giterr_set(GITERR_OS, "File size overflow (for 32-bits) on '%s'", + giterr_set(GITERR_OS, "file size overflow (for 32-bits) on '%s'", entry.path); error = -1; } else if (!(error = git_filter_list_load(&fl, @@ -1587,7 +1587,7 @@ int git_diff__commit( char commit_oidstr[GIT_OID_HEXSZ + 1]; error = -1; - giterr_set(GITERR_INVALID, "Commit %s is a merge commit", + giterr_set(GITERR_INVALID, "commit %s is a merge commit", git_oid_tostr(commit_oidstr, GIT_OID_HEXSZ + 1, git_commit_id(commit))); goto on_error; } |