diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:39:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:39:38 -0700 |
| commit | 49981d8a250837019b4a14f44d471fc6ff7e334f (patch) | |
| tree | c3394268eaaade296d7de692fe7e76bacb3be97b /diffcore.h | |
| parent | 0202c411edc25940cc381bf317badcdf67670be4 (diff) | |
| parent | 6ebdac1bab966b720d776aa43ca188fe378b1f4b (diff) | |
| download | git-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.xz | |
Start maintenance track for 2.10.x series
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore.h b/diffcore.h index 33ea2de348..c11b8465fc 100644 --- a/diffcore.h +++ b/diffcore.h @@ -25,7 +25,7 @@ struct userdiff_driver; struct diff_filespec { - unsigned char sha1[20]; + struct object_id oid; char *path; void *data; void *cnt_data; @@ -33,7 +33,7 @@ struct diff_filespec { int count; /* Reference count */ int rename_used; /* Count of rename users */ unsigned short mode; /* file mode */ - unsigned sha1_valid : 1; /* if true, use sha1 and trust mode; + unsigned oid_valid : 1; /* if true, use oid and trust mode; * if false, use the name and read from * the filesystem. */ |