diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-24 11:36:41 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-25 08:15:44 +0100 |
| commit | d541170c77b7ac738e2ffcdd04c838fb7cbbfb87 (patch) | |
| tree | b4c829668eb8a1aa8db798bfdd31e95bb1a946e0 /src/merge_file.c | |
| parent | d0a3de720e085d335d9ad46dc00a23dd03eda793 (diff) | |
| download | libgit2-d541170c77b7ac738e2ffcdd04c838fb7cbbfb87.tar.gz | |
index: rename an entry's id to 'id'
This was not converted when we converted the rest, so do it now.
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 9961ef297..0878866bc 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -77,7 +77,7 @@ int git_merge_file_input_from_index_entry( return 0; if ((error = git_repository_odb(&odb, repo)) < 0 || - (error = git_odb_read(&input->odb_object, odb, &entry->oid)) < 0) + (error = git_odb_read(&input->odb_object, odb, &entry->id)) < 0) goto done; input->mode = entry->mode; |