diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-24 20:23:17 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-25 08:15:44 +0100 |
| commit | 9950bb4e8de076565976128559ff273e9d4a2a78 (patch) | |
| tree | 6514d51afd8a447c1cfdf86eece2ae28df2e1fa4 /src/diff_print.c | |
| parent | f000ee4e5b840e9f110123a050777fb1301b19bf (diff) | |
| download | libgit2-9950bb4e8de076565976128559ff273e9d4a2a78.tar.gz | |
diff: rename the file's 'oid' to 'id'
In the same vein as the previous commits in this series.
Diffstat (limited to 'src/diff_print.c')
| -rw-r--r-- | src/diff_print.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/diff_print.c b/src/diff_print.c index dd31d1ffa..5bacc5cc6 100644 --- a/src/diff_print.c +++ b/src/diff_print.c @@ -170,8 +170,8 @@ static int diff_print_one_raw( git_buf_clear(out); - git_oid_tostr(start_oid, pi->oid_strlen, &delta->old_file.oid); - git_oid_tostr(end_oid, pi->oid_strlen, &delta->new_file.oid); + git_oid_tostr(start_oid, pi->oid_strlen, &delta->old_file.id); + git_oid_tostr(end_oid, pi->oid_strlen, &delta->new_file.id); git_buf_printf( out, ":%06o %06o %s... %s... %c", @@ -203,8 +203,8 @@ static int diff_print_oid_range( { char start_oid[GIT_OID_HEXSZ+1], end_oid[GIT_OID_HEXSZ+1]; - git_oid_tostr(start_oid, oid_strlen, &delta->old_file.oid); - git_oid_tostr(end_oid, oid_strlen, &delta->new_file.oid); + git_oid_tostr(start_oid, oid_strlen, &delta->old_file.id); + git_oid_tostr(end_oid, oid_strlen, &delta->new_file.id); /* TODO: Match git diff more closely */ if (delta->old_file.mode == delta->new_file.mode) { @@ -235,11 +235,11 @@ static int diff_delta_format_with_paths( const char *oldpath = delta->old_file.path; const char *newpath = delta->new_file.path; - if (git_oid_iszero(&delta->old_file.oid)) { + if (git_oid_iszero(&delta->old_file.id)) { oldpfx = ""; oldpath = "/dev/null"; } - if (git_oid_iszero(&delta->new_file.oid)) { + if (git_oid_iszero(&delta->new_file.id)) { newpfx = ""; newpath = "/dev/null"; } |