diff options
| author | Vicent Marti <vicent@github.com> | 2014-01-27 09:39:36 -0800 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-01-27 09:39:36 -0800 |
| commit | 93954245e081ff803028431c5da2c8a073512643 (patch) | |
| tree | cb9a16891871bead0af7188f7400c8e7ae4c8692 /include/git2/diff.h | |
| parent | 46e7fc1853bb92a2deae93543477f1c1255352d0 (diff) | |
| parent | a1bbc0ce205b6d3496338d3253c847aa91cabc7b (diff) | |
| download | libgit2-93954245e081ff803028431c5da2c8a073512643.tar.gz | |
Merge pull request #2075 from libgit2/cmn/leftover-oid
Leftover OID -> ID changes
Diffstat (limited to 'include/git2/diff.h')
| -rw-r--r-- | include/git2/diff.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index 76fb23654..a3cdd8193 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; @@ -361,7 +361,7 @@ typedef struct { uint16_t context_lines; /**< defaults to 3 */ uint16_t interhunk_lines; /**< defaults to 0 */ - uint16_t oid_abbrev; /**< default 'core.abbrev' or 7 if unset */ + uint16_t id_abbrev; /**< default 'core.abbrev' or 7 if unset */ git_off_t max_size; /**< defaults to 512MB */ const char *old_prefix; /**< defaults to "a" */ const char *new_prefix; /**< defaults to "b" */ |