diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-02 00:25:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-02 13:59:50 +0900 |
| commit | 2182abd94bf69a8daba18e71efae3e9f02a6c465 (patch) | |
| tree | 23d79183a42224fc33bab5530b7f795d24f0001a /split-index.h | |
| parent | 34caab0261d87b230520f97f2d1ce9ca4474dc73 (diff) | |
| download | git-2182abd94bf69a8daba18e71efae3e9f02a6c465.tar.gz | |
split-index: convert struct split_index to object_id
Convert the base_sha1 member of struct split_index to use struct
object_id and rename it base_oid. Include cache.h to make the structure
visible.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'split-index.h')
| -rw-r--r-- | split-index.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/split-index.h b/split-index.h index 43d66826eb..7a435ca2c9 100644 --- a/split-index.h +++ b/split-index.h @@ -1,12 +1,14 @@ #ifndef SPLIT_INDEX_H #define SPLIT_INDEX_H +#include "cache.h" + struct index_state; struct strbuf; struct ewah_bitmap; struct split_index { - unsigned char base_sha1[20]; + struct object_id base_oid; struct index_state *base; struct ewah_bitmap *delete_bitmap; struct ewah_bitmap *replace_bitmap; |