mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
1b5f37334a
Change several commands to remove ignored files by default when they are in the way. Since some commands (checkout, merge) take a --no-overwrite-ignore option to allow the user to configure this, and it may make sense to add that option to more commands (and in the case of merge, actually plumb that configuration option through to more of the backends than just the fast-forwarding special case), add little comments about where such flags would be used. Incidentally, this fixes a test failure in t7112. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
20 lines
422 B
Bash
Executable file
20 lines
422 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='reset can handle submodules'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
|
|
|
KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
|
|
|
|
test_submodule_switch_recursing_with_args "reset --keep"
|
|
|
|
test_submodule_forced_switch_recursing_with_args "reset --hard"
|
|
|
|
test_submodule_switch "reset --keep"
|
|
|
|
test_submodule_switch "reset --merge"
|
|
|
|
test_submodule_forced_switch "reset --hard"
|
|
|
|
test_done
|