mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![Jens Lehmann](/assets/img/avatar_default.png)
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>
15 lines
264 B
Bash
Executable file
15 lines
264 B
Bash
Executable file
#!/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
|