| commit | 921f50b48e2d5283bbd3c5ea2c64ad7407a2bc1c | |
| author | Jens Lehmann <Jens.Lehmann@web.de> | |
| Sun, 15 Jun 2014 17:02:47 +0000 (15 19:02 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jul 2014 19:06:16 +0000 (14 12:06 -0700) | ||
| tree | 1f10885287ac568ca290edf3b491ff3b1b83bdf4 | treesnapshot (tar.gz zip) |
| parent | c7e69168cf9215f50c42666c7e0dbb1f21c69e20 | commitdiff |
pull: add t5572 for submodule updates
Test that the pull 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 each. Add
helper functions to reset the branch to be updated to to the current
HEAD so that pull is doing the transition from HEAD to the given branch.
Set KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
and KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that pull has the same --no-ff known failures merge has.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Test that the pull 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 each. Add
helper functions to reset the branch to be updated to to the current
HEAD so that pull is doing the transition from HEAD to the given branch.
Set KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
and KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that pull has the same --no-ff known failures merge has.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t5572-pull-submodule.sh | [new file with mode: 0755] | blob |