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

package info (click to toggle)
git 1%3A2.51.0-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 61,616 kB
  • sloc: ansic: 304,617; sh: 259,866; perl: 25,871; tcl: 21,754; makefile: 4,158; python: 3,442; javascript: 772; csh: 45
file content (17 lines) | stat: -rwxr-xr-x 304 bytes parent folder | download | duplicates (3) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
 
#!/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"

test_submodule_switch "merge --no-ff"

test_done