| commit | 1621c99c79875d6537edc59b6c2b4c2038a97b20 | |
| author | Jens Lehmann <Jens.Lehmann@web.de> | |
| Thu, 19 Jun 2014 20:12:56 +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 | 9a743e1869356be86446d2895beffd39698c2c6f | treesnapshot (tar.gz zip) |
| parent | da7fe3fb6d810507bef586e76a01bb34758d4472 | commitdiff |
revert: add t3513 for submodule updates
Test that the revert command updates the work tree as expected (for
submodule changes which don't result in conflicts). Add a helper function
to first revert the checked out target commit to make the last revert
produce the to-be-tested work tree.
Set the KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT and
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR switches to
document that revert has the similar failures.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Test that the revert command updates the work tree as expected (for
submodule changes which don't result in conflicts). Add a helper function
to first revert the checked out target commit to make the last revert
produce the to-be-tested work tree.
Set the KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT and
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR switches to
document that revert has the similar failures.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3513-revert-submodule.sh | [new file with mode: 0755] | blob |