summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2017-03-14 14:46:30 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-15 18:15:54 -0700
commit259f3ee29666eddf65fb0fe0e3fd14aa22f33cba (patch)
tree695f8b4e6d2db2340ae884c8d1e09bc7865eae69 /submodule.c
parentlib-submodule-update.sh: replace sha1 by hash (diff)
downloadtgif-259f3ee29666eddf65fb0fe0e3fd14aa22f33cba.tar.xz
lib-submodule-update.sh: define tests for recursing into submodules
Currently lib-submodule-update.sh provides 2 functions test_submodule_switch and test_submodule_forced_switch that are used by a variety of tests to ensure that submodules behave as expected. The current expected behavior is that submodules are not touched at all (see 42639d2317a for the exact setup). In the future we want to teach all these commands to recurse into submodules. To do that, we'll add two testing functions to submodule-update-lib.sh: test_submodule_switch_recursing and test_submodule_forced_switch_recursing. These two functions behave in analogy to the already existing functions just with a different expectation on submodule behavior. The submodule in the working tree is expected to be updated to the recorded submodule version. The behavior is analogous to e.g. the behavior of files in a nested directory in the working tree, where a change to the working tree handles any arising directory/file conflicts just fine. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
0 files changed, 0 insertions, 0 deletions