kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54148 Commits
6 Branches
36 Tags
131 MiB
 
 
 
 
 
 
Tree: b21ebb671b
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'b21ebb671b'
${ noResults }
git/t/t7613-merge-submodule.sh

19 lines
450 B
Raw Blame History

#!/bin/sh
test_description='merge can handle submodules'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh
# merges without conflicts
test_submodule_switch "git merge"
test_submodule_switch "git merge --ff"
test_submodule_switch "git 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 "git merge --no-ff"
test_done