Skip to main content

Browse the archive

Revision 27547e5fccda134560ad0441aa5bfa187387cec0 authored by Junio C Hamano on 16 April 2015, 17:48:58 UTC, committed by Junio C Hamano on 16 April 2015, 18:35:38 UTC 
attr: skip UTF8 BOM at the beginning of the input file
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 599446d
Raw File
t4255-am-submodule.sh 
#!/bin/sh

test_description='git am handling submodules'

. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh

am () {
	git format-patch --stdout --ignore-submodules=dirty "..$1" | git am -
}

test_submodule_switch "am"

am_3way () {
	git format-patch --stdout --ignore-submodules=dirty "..$1" | git am --3way -
}

KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
test_submodule_switch "am_3way"

test_done
back to top