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/merge_file.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/merge_file.c')
| -rw-r--r-- | src/merge_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge_file.c b/src/merge_file.c index 0878866bc..986fbf9fe 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -108,7 +108,7 @@ int git_merge_file_input_from_diff_file( return 0; if ((error = git_repository_odb(&odb, repo)) < 0 || - (error = git_odb_read(&input->odb_object, odb, &file->oid)) < 0) + (error = git_odb_read(&input->odb_object, odb, &file->id)) < 0) goto done; input->mode = file->mode; |