t / t4137-apply-submodule.shon commit Merge branch 'ss/pull-rebase-preserve' into maint (ad00aeb)
   1#!/bin/sh
   2
   3test_description='git apply handling submodules'
   4
   5. ./test-lib.sh
   6. "$TEST_DIRECTORY"/lib-submodule-update.sh
   7
   8apply_index () {
   9        git diff --ignore-submodules=dirty "..$1" | git apply --index -
  10}
  11
  12test_submodule_switch "apply_index"
  13
  14apply_3way () {
  15        git diff --ignore-submodules=dirty "..$1" | git apply --3way -
  16}
  17
  18test_submodule_switch "apply_3way"
  19
  20test_done