mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
reset: add t7112 for submodule updates
Test that the reset command updates the work tree as expected for changes with '--keep', '--merge' (for changes which don't result in conflicts) and '--hard'. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
48294e1ddb
commit
8ef85694a5
14
t/t7112-reset-submodule.sh
Executable file
14
t/t7112-reset-submodule.sh
Executable file
|
@ -0,0 +1,14 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
test_description='reset can handle submodules'
|
||||||
|
|
||||||
|
. ./test-lib.sh
|
||||||
|
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
||||||
|
|
||||||
|
test_submodule_switch "git reset --keep"
|
||||||
|
|
||||||
|
test_submodule_switch "git reset --merge"
|
||||||
|
|
||||||
|
test_submodule_forced_switch "git reset --hard"
|
||||||
|
|
||||||
|
test_done
|
Loading…
Reference in a new issue