diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2014-06-15 19:01:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-14 12:06:15 -0700 |
| commit | 663ed39a889dae8beee2fc6953607f7660a5cddf (patch) | |
| tree | cc0c59421dd5c7977f1fa9210e5506dff096c746 /t/t4013/diff.format-patch_--inline_--stdout_initial..side | |
| parent | 8f8ba56b5b6321b07eba29bb7ae6a94b5ae0d34a (diff) | |
| download | git-663ed39a889dae8beee2fc6953607f7660a5cddf.tar.gz git-663ed39a889dae8beee2fc6953607f7660a5cddf.zip | |
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>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..side')
0 files changed, 0 insertions, 0 deletions