File: t6438-submodule-directory-file-conflicts.sh

package info (click to toggle)
git 1%3A2.30.2-1%2Bdeb11u2
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 53,128 kB
  • sloc: ansic: 237,972; sh: 206,995; perl: 29,970; tcl: 22,151; python: 6,357; makefile: 3,843; javascript: 772; sed: 189; asm: 98; csh: 45; ruby: 43; lisp: 12
file content (19 lines) | stat: -rwxr-xr-x 434 bytes parent folder | download 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
 
#!/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