diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-31 22:38:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-31 22:38:52 (GMT) |
| commit | 5a4f07b32207044eb8380f2893f807cc8ab9d58f (patch) | |
| tree | 8860227eb2821a6e7d6d490cb31a4b32a28227ff /Makefile | |
| parent | fc9dfda1be25ab3bb311900c6cfbf59d6b6e224e (diff) | |
| parent | 027771fcb153e0003bcb2d68e1838594a48b0161 (diff) | |
| download | git-5a4f07b32207044eb8380f2893f807cc8ab9d58f.zip git-5a4f07b32207044eb8380f2893f807cc8ab9d58f.tar.gz git-5a4f07b32207044eb8380f2893f807cc8ab9d58f.tar.bz2 | |
Merge branch 'hv/submodule-config'
The gitmodules API accessed from the C code learned to cache stuff
lazily.
* hv/submodule-config:
submodule: allow erroneous values for the fetchRecurseSubmodules option
submodule: use new config API for worktree configurations
submodule: extract functions for config set and lookup
submodule: implement a config API for lookup of .gitmodules values
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -593,6 +593,7 @@ TEST_PROGRAMS_NEED_X += test-sha1 TEST_PROGRAMS_NEED_X += test-sha1-array TEST_PROGRAMS_NEED_X += test-sigchain TEST_PROGRAMS_NEED_X += test-string-list +TEST_PROGRAMS_NEED_X += test-submodule-config TEST_PROGRAMS_NEED_X += test-subprocess TEST_PROGRAMS_NEED_X += test-svn-fe TEST_PROGRAMS_NEED_X += test-urlmatch-normalization @@ -784,6 +785,7 @@ LIB_OBJS += strbuf.o LIB_OBJS += streaming.o LIB_OBJS += string-list.o LIB_OBJS += submodule.o +LIB_OBJS += submodule-config.o LIB_OBJS += symlinks.o LIB_OBJS += tag.o LIB_OBJS += tempfile.o |