Browse Source

apply: add t4137 for submodule updates

Test that the apply command updates the work tree as expected for the
'--index' and the '--3way' options (for submodule changes which don't
result in conflicts).

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jens Lehmann 11 years ago committed by Junio C Hamano
parent
commit
558643e1d6
  1. 20
      t/t4137-apply-submodule.sh

20
t/t4137-apply-submodule.sh

@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
#!/bin/sh

test_description='git apply handling submodules'

. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh

apply_index () {
git diff --ignore-submodules=dirty "..$1" | git apply --index -
}

test_submodule_switch "apply_index"

apply_3way () {
git diff --ignore-submodules=dirty "..$1" | git apply --3way -
}

test_submodule_switch "apply_3way"

test_done
Loading…
Cancel
Save