t/t6438-submodule-directory-file-conflicts.sh

   1 #!/bin/sh
   2
   3 test_description='merge can handle submodules'
   4
   5 TEST_PASSES_SANITIZE_LEAK=true
   6 . ./test-lib.sh
   7 . "$TEST_DIRECTORY"/lib-submodule-update.sh
   8
   9 # merges without conflicts
  10 test_submodule_switch "merge"
  11
  12 test_submodule_switch "merge --ff"
  13
  14 test_submodule_switch "merge --ff-only"
  15
  16 if test "$GIT_TEST_MERGE_ALGORITHM" != ort
  17 then
  18         KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
  19         KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
  20 fi
  21 test_submodule_switch "merge --no-ff"
  22
  23 test_done