Re: [PATCH] failure with diff --submodule=diff with moved nested submodule HEAD
From: Junio C Hamano <hidden>
Date: 2017-03-31 19:38:24
Stefan Beller [off-list ref] writes:
This fails reliable for me. Signed-off-by: Stefan Beller <redacted> ---
I take it that this is a WIP for the testing half of the patch you are working on (i.e. you are not just throwing a patch to document known breakage to be fixed later, in which case these would have been _expect_failure). Thanks.
quoted hunk
t/t4060-diff-submodule-option-diff-format.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh index 7e23b55ea4..89bced3484 100755 --- a/t/t4060-diff-submodule-option-diff-format.sh +++ b/t/t4060-diff-submodule-option-diff-format.sh@@ -746,4 +746,20 @@ test_expect_success 'diff --submodule=diff with .git file' ' test_cmp expected actual ' +test_expect_success 'setup nested submodule' ' + git submodule add -f ./sm2 && + git commit -a -m "add sm2" && + git -C sm2 submodule add ../sm2 && + git -C sm2 commit -a -m "nested sub" +' + +test_expect_success 'move nested submodule HEAD' ' + git -C sm2/sm2 commit --allow-empty -m "new HEAD" +' + +test_expect_success 'diff --submodule=diff with moved nested submodule HEAD' ' + git -C sm2 diff --submodule=diff >actual 2>err && + test_must_be_empty err +' + test_done