mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01:00
48294e1ddb
Test that the read-tree command updates the work tree as expected for changes which don't result in conflicts with the '-m' and '--reset' flag. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 lines
236 B
Bash
Executable file
12 lines
236 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='read-tree can handle submodules'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
|
|
|
test_submodule_switch "git read-tree -u -m"
|
|
|
|
test_submodule_forced_switch "git read-tree -u --reset"
|
|
|
|
test_done
|