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

mirrors/git

mirror of https://github.com/git/git.git synced 2024-10-31 06:17:56 +01:00

14 lines

353 B

Bash

Raw Normal View History

cherry-pick: add t3512 for submodule updates Test that the cherry-pick command updates the work tree as expected (for submodule changes which don't result in conflicts). Set KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES and KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to document that cherry-pick has the same --no-ff known failures merge has. Implement the KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT switch to expect the known failure that while cherry picking just a SHA-1 update for an ignored submodule the commit incorrectly fails with "The previous cherry-pick is now empty, possibly due to conflict resolution.". Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-06-15 19:03:18 +02:00			`#!/bin/sh`

			`test_description='cherry-pick can handle submodules'`

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

			`KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1`
			`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 cherry-pick"`

			`test_done`