diff options
author | David Turner <dturner@twosigma.com> | 2016-11-07 13:31:31 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-11-17 20:25:54 -0800 |
commit | 5423d2e7005eca89481d3137569b2b96b4d133ff (patch) | |
tree | 40cf180af1c7e90518471610df7e269a2adaef18 /t/t3030-merge-recursive.sh | |
parent | 3ab228137f980ff72dbdf5064a877d07bec76df9 (diff) | |
download | git-5423d2e7005eca89481d3137569b2b96b4d133ff.tar.gz git-5423d2e7005eca89481d3137569b2b96b4d133ff.tar.xz |
submodules: allow empty working-tree dirs in merge/cherry-pick
When a submodule is being merged or cherry-picked into a working
tree that already contains a corresponding empty directory, do not
record a conflict.
One situation where this bug appears is:
- Commit 1 adds a submodule
- Commit 2 removes that submodule and re-adds it into a subdirectory
(sub1 to sub1/sub1).
- Commit 3 adds an unrelated file.
Now the user checks out commit 1 (first deinitializing the submodule),
and attempts to cherry-pick commit 3. Previously, this would fail,
because the incoming submodule sub1/sub1 would falsely conflict with
the empty sub1 directory.
This patch ignores the empty sub1 directory, fixing the bug. We only
ignore the empty directory if the object being emplaced is a
submodule, which expects an empty directory.
Signed-off-by: David Turner <dturner@twosigma.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
-rwxr-xr-x | t/t3030-merge-recursive.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 470f33466..9a893b5fe 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 && ( |