| commit | c7e69168cf9215f50c42666c7e0dbb1f21c69e20 | |
| author | Jens Lehmann <Jens.Lehmann@web.de> | |
| Thu, 19 Jun 2014 20:12:51 +0000 (19 22:12 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jul 2014 19:06:16 +0000 (14 12:06 -0700) | ||
| tree | 34b87a4b6ca592fe88a39dd15c425bddc95939db | treesnapshot (tar.gz zip) |
| parent | 663ed39a889dae8beee2fc6953607f7660a5cddf | commitdiff |
rebase: add t3426 for submodule updates
Test that the rebase command updates the work tree as expected for
changes which don't result in conflicts. To make that work add two
helper functions that add a commit only touching files and then
revert it. This allows to rebase the target commit over these two
and to compare the result.
Set KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that "replace directory with submodule" fails for an
interactive rebase because a directory "sub1" already exists.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Test that the rebase command updates the work tree as expected for
changes which don't result in conflicts. To make that work add two
helper functions that add a commit only touching files and then
revert it. This allows to rebase the target commit over these two
and to compare the result.
Set KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that "replace directory with submodule" fails for an
interactive rebase because a directory "sub1" already exists.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3426-rebase-submodule.sh | [new file with mode: 0755] | blob |