| commit | 283f56a40bd9538d7277bb866526d5cae4494eec | |
| author | Jens Lehmann <Jens.Lehmann@web.de> | |
| Sun, 15 Jun 2014 17:03:18 +0000 (15 19:03 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jul 2014 19:06:16 +0000 (14 12:06 -0700) | ||
| tree | dbf8ba614b05af8ea74addac35e586eb18286405 | treesnapshot (tar.gz zip) |
| parent | 921f50b48e2d5283bbd3c5ea2c64ad7407a2bc1c | commitdiff |
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>
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>
| t/lib-submodule-update.sh | diffblobblamehistory | |
| t/t3512-cherry-pick-submodule.sh | [new file with mode: 0755] | blob |