diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-02 00:25:42 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-02 13:59:50 +0900 |
| commit | 34caab0261d87b230520f97f2d1ce9ca4474dc73 (patch) | |
| tree | 0e9cd37cd4d44e60e30cfb3365e7964c6553b1da /submodule-config.h | |
| parent | c54f5ca97075fcaa11841e80855d55e0af29ea72 (diff) | |
| download | git-34caab0261d87b230520f97f2d1ce9ca4474dc73.tar.gz git-34caab0261d87b230520f97f2d1ce9ca4474dc73.tar.xz | |
submodule-config: convert structures to object_id
Convert struct submodule and struct parse_config_parameter to use struct
object_id. Adjust the functions which take members of these structures
as arguments to also use struct object_id. Include cache.h into
submodule-config.h to make struct object_id visible.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule-config.h')
| -rw-r--r-- | submodule-config.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/submodule-config.h b/submodule-config.h index a5503a5d1..11729fbc7 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -1,6 +1,7 @@ #ifndef SUBMODULE_CONFIG_CACHE_H #define SUBMODULE_CONFIG_CACHE_H +#include "cache.h" #include "hashmap.h" #include "submodule.h" #include "strbuf.h" @@ -17,13 +18,13 @@ struct submodule { const char *ignore; const char *branch; struct submodule_update_strategy update_strategy; - /* the sha1 blob id of the responsible .gitmodules file */ - unsigned char gitmodules_sha1[20]; + /* the object id of the responsible .gitmodules file */ + struct object_id gitmodules_oid; int recommend_shallow; }; #define SUBMODULE_INIT { NULL, NULL, NULL, RECURSE_SUBMODULES_NONE, \ - NULL, NULL, SUBMODULE_UPDATE_STRATEGY_INIT, {0}, -1 }; + NULL, NULL, SUBMODULE_UPDATE_STRATEGY_INIT, { { 0 } }, -1 }; struct submodule_cache; struct repository; |