git.oblomov.eu Git - git/blob - t/t6438-submodule-directory-file-conflicts.sh

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