Andrew's git / gitweb.git / t/t4255-am-submodule.sh
?
t / t4255-am-submodule.shon commit t9001: style modernisation phase #3 (acd72b5)
   1#!/bin/sh
   2
   3test_description='git am handling submodules'
   4
   5. ./test-lib.sh
   6. "$TEST_DIRECTORY"/lib-submodule-update.sh
   7
   8am () {
   9        git format-patch --stdout --ignore-submodules=dirty "..$1" | git am -
  10}
  11
  12test_submodule_switch "am"
  13
  14am_3way () {
  15        git format-patch --stdout --ignore-submodules=dirty "..$1" | git am --3way -
  16}
  17
  18KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
  19test_submodule_switch "am_3way"
  20
  21test_done