diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:47 -0800 |
| commit | a616162909ae756c36cef17cea7466c3f500caec (patch) | |
| tree | 34f9396e52264c05188aad352cc24d2d6039faee /t | |
| parent | Merge branch 'jk/rev-parse-symbolic-parents-fix' (diff) | |
| parent | submodules: allow empty working-tree dirs in merge/cherry-pick (diff) | |
| download | tgif-a616162909ae756c36cef17cea7466c3f500caec.tar.xz | |
Merge branch 'dt/empty-submodule-in-merge'
An empty directory in a working tree that can simply be nuked used
to interfere while merging or cherry-picking a change to create a
submodule directory there, which has been fixed..
* dt/empty-submodule-in-merge:
submodules: allow empty working-tree dirs in merge/cherry-pick
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3030-merge-recursive.sh | 4 | ||||
| -rwxr-xr-x | t/t3426-rebase-submodule.sh | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 470f33466c..9a893b5fe7 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -575,13 +575,13 @@ test_expect_success 'merge removes empty directories' ' test_must_fail test -d d ' -test_expect_failure 'merge-recursive simple w/submodule' ' +test_expect_success 'merge-recursive simple w/submodule' ' git checkout submod && git merge remove ' -test_expect_failure 'merge-recursive simple w/submodule result' ' +test_expect_success 'merge-recursive simple w/submodule result' ' git ls-files -s >actual && ( diff --git a/t/t3426-rebase-submodule.sh b/t/t3426-rebase-submodule.sh index d5b896d445..ebf4f5e4b2 100755 --- a/t/t3426-rebase-submodule.sh +++ b/t/t3426-rebase-submodule.sh @@ -38,9 +38,6 @@ git_rebase_interactive () { git rebase -i "$1" } -KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 -# The real reason "replace directory with submodule" fails is because a -# directory "sub1" exists, but we reuse the suppression added for merge here test_submodule_switch "git_rebase_interactive" test_done |