summaryrefslogtreecommitdiff
path: root/include/git2
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@github.com>2016-08-03 17:09:41 -0400
committerEdward Thomson <ethomson@github.com>2016-08-03 17:57:37 -0400
commit002c8e29a1bbe7bf5c07c9c26037d4f6a1ac81a6 (patch)
tree0b5d4385c8f197eedb77f89752edb9c0f93f2bbb /include/git2
parent152efee20b74ea261cf8e05410a110687e17376e (diff)
downloadlibgit2-002c8e29a1bbe7bf5c07c9c26037d4f6a1ac81a6.tar.gz
git_diff_file: move `id_abbrev`ethomson/diff_file
Move `id_abbrev` to a more reasonable place where it packs more nicely (before anybody starts using it).
Diffstat (limited to 'include/git2')
-rw-r--r--include/git2/diff.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h
index 005b33965..ac5db711c 100644
--- a/include/git2/diff.h
+++ b/include/git2/diff.h
@@ -268,11 +268,6 @@ typedef enum {
* absent side of a diff (e.g. the `old_file` of a `GIT_DELTA_ADDED` delta),
* then the oid will be zeroes.
*
- * The `id_abbrev` represents the known length of the `id` field, when
- * converted to a hex string. It is generally `GIT_OID_HEXSZ`, unless this
- * delta was created from reading a patch file, in which case it may be
- * abbreviated to something reasonable, like 7 characters.
- *
* `path` is the NUL-terminated path to the entry relative to the working
* directory of the repository.
*
@@ -282,14 +277,19 @@ typedef enum {
*
* `mode` is, roughly, the stat() `st_mode` value for the item. This will
* be restricted to one of the `git_filemode_t` values.
+ *
+ * The `id_abbrev` represents the known length of the `id` field, when
+ * converted to a hex string. It is generally `GIT_OID_HEXSZ`, unless this
+ * delta was created from reading a patch file, in which case it may be
+ * abbreviated to something reasonable, like 7 characters.
*/
typedef struct {
git_oid id;
- int id_abbrev;
const char *path;
git_off_t size;
uint32_t flags;
uint16_t mode;
+ uint16_t id_abbrev;
} git_diff_file;
/**