diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-19 18:44:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-19 18:45:08 (GMT) |
| commit | 5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5 (patch) | |
| tree | 69e47a672d37c3e818c8516bd1529e33dcf2f34b /Makefile | |
| parent | f932729cc7707390f4d6739be1573e93ceb9df22 (diff) | |
| parent | 027771fcb153e0003bcb2d68e1838594a48b0161 (diff) | |
| download | git-5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5.zip git-5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5.tar.gz git-5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5.tar.bz2 | |
Merge 'hv/submodule-config' to 'sb/submodule-helper'
* 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
@@ -594,6 +594,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 @@ -785,6 +786,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 += trace.o |