mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-15 05:33:04 +01:00

20 lines

450 B

Bash

Raw Normal View History

merge: add t7613 for submodule updates Test that the merge command updates the work tree as expected (for submodule changes which don't result in conflicts) when used without arguments or with the '--ff', '--ff-only' and '--no-ff' flag. Implement the KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR switch to expect the known failure that --no-ff merges do not create the empty submodule directory. The KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES switch is also implemented to expect the known failure that --no-ff merges attempt to merge the new files in the former submodule directory with those of the removed submodule. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-06-15 19:01:41 +02:00			`#!/bin/sh`

			`test_description='merge can handle submodules'`

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

			`# merges without conflicts`
			`test_submodule_switch "git merge"`

			`test_submodule_switch "git merge --ff"`

			`test_submodule_switch "git merge --ff-only"`

			`KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1`
			`KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1`
			`test_submodule_switch "git merge --no-ff"`

			`test_done`