about summary refs log blame commit diff
path: root/third_party/git/t/t6438-submodule-directory-file-conflicts.sh
blob: 04bf4be7d79224cebbe66df806acbe069f200e9e (plain) (tree)
1
2
3
4
5
6
7
8
9







                                              
                             
 
                                  
 
                                       


                                                                    
                                     

         
#!/bin/sh

test_description='merge can handle submodules'

. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh

# merges without conflicts
test_submodule_switch "merge"

test_submodule_switch "merge --ff"

test_submodule_switch "merge --ff-only"

KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
test_submodule_switch "merge --no-ff"

test_done