development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 11:07:55 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

reset: add t7112 for submodule updates

Browse source 
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:
Jens Lehmann 2014-06-15 19:00:28 +02:00 committed by Junio C Hamano
parent 48294e1ddb
commit 8ef85694a5
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
t/t7112-reset-submodule.sh Executable file
View 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