Andrew's git / gitweb.git / t/t7613-merge-submodule.sh
?
t / t7613-merge-submodule.shon commit t5532: use write_script (ca386ee)
   1#!/bin/sh
   2
   3test_description='merge can handle submodules'
   4
   5. ./test-lib.sh
   6. "$TEST_DIRECTORY"/lib-submodule-update.sh
   7
   8# merges without conflicts
   9test_submodule_switch "git merge"
  10
  11test_submodule_switch "git merge --ff"
  12
  13test_submodule_switch "git merge --ff-only"
  14
  15KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
  16KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
  17test_submodule_switch "git merge --no-ff"
  18
  19test_done