summaryrefslogtreecommitdiff
path: root/include/git2/diff.h
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2014-01-24 20:23:17 +0100
committerCarlos Martín Nieto <cmn@dwim.me>2014-01-25 08:15:44 +0100
commit9950bb4e8de076565976128559ff273e9d4a2a78 (patch)
tree6514d51afd8a447c1cfdf86eece2ae28df2e1fa4 /include/git2/diff.h
parentf000ee4e5b840e9f110123a050777fb1301b19bf (diff)
downloadlibgit2-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 'include/git2/diff.h')
-rw-r--r--include/git2/diff.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h
index 76fb23654..d7c294309 100644
--- a/include/git2/diff.h
+++ b/include/git2/diff.h
@@ -203,7 +203,7 @@ typedef struct git_diff git_diff;
typedef enum {
GIT_DIFF_FLAG_BINARY = (1u << 0), /** file(s) treated as binary data */
GIT_DIFF_FLAG_NOT_BINARY = (1u << 1), /** file(s) treated as text data */
- GIT_DIFF_FLAG_VALID_OID = (1u << 2), /** `oid` value is known correct */
+ GIT_DIFF_FLAG_VALID_ID = (1u << 2), /** `id` value is known correct */
} git_diff_flag_t;
/**
@@ -250,7 +250,7 @@ typedef enum {
* be restricted to one of the `git_filemode_t` values.
*/
typedef struct {
- git_oid oid;
+ git_oid id;
const char *path;
git_off_t size;
uint32_t flags;