diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:22 (GMT) |
| commit | abb4824d13a44f68d1bbaf6726945983230771f9 (patch) | |
| tree | 316449048983aa8a4503af46cd450199a69b1078 /cache.h | |
| parent | 504bdc59948831ebccafb1be9f90bb58c02303eb (diff) | |
| parent | 2b1257e463fe97b3f657bbf30fafdea0c4847cd7 (diff) | |
| download | git-abb4824d13a44f68d1bbaf6726945983230771f9.zip git-abb4824d13a44f68d1bbaf6726945983230771f9.tar.gz git-abb4824d13a44f68d1bbaf6726945983230771f9.tar.bz2 | |
Merge branch 'ao/submodule-wo-gitmodules-checked-out'
The submodule support has been updated to read from the blob at
HEAD:.gitmodules when the .gitmodules file is missing from the
working tree.
* ao/submodule-wo-gitmodules-checked-out:
t/helper: add test-submodule-nested-repo-config
submodule: support reading .gitmodules when it's not in the working tree
submodule: add a helper to check if it is safe to write to .gitmodules
t7506: clean up .gitmodules properly before setting up new scenario
submodule: use the 'submodule--helper config' command
submodule--helper: add a new 'config' subcommand
t7411: be nicer to future tests and really clean things up
t7411: merge tests 5 and 6
submodule: factor out a config_set_in_gitmodules_file_gently function
submodule: add a print_config_from_gitmodules() helper
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -486,6 +486,8 @@ static inline enum object_type object_type(unsigned int mode) #define INFOATTRIBUTES_FILE "info/attributes" #define ATTRIBUTE_MACRO_PREFIX "[attr]" #define GITMODULES_FILE ".gitmodules" +#define GITMODULES_INDEX ":.gitmodules" +#define GITMODULES_HEAD "HEAD:.gitmodules" #define GIT_NOTES_REF_ENVIRONMENT "GIT_NOTES_REF" #define GIT_NOTES_DEFAULT_REF "refs/notes/commits" #define GIT_NOTES_DISPLAY_REF_ENVIRONMENT "GIT_NOTES_DISPLAY_REF" |