On Sat, Jul 7, 2018 at 1:44 PM Elijah Newren <newren@xxxxxxxxx> wrote:
>
> In the case of a file/submodule conflict, although both cannot exist at
> the same path, we expect both to be present somewhere for the user to be
> able to resolve the conflict with. Add a testcase for this.
>
> Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
> ---
> t/t7405-submodule-merge.sh | 56 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 56 insertions(+)
>
> diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
> index 7bfb2f498..95fd05d83 100755
> --- a/t/t7405-submodule-merge.sh
> +++ b/t/t7405-submodule-merge.sh
> @@ -279,4 +279,60 @@ test_expect_success 'recursive merge with submodule' '
> grep "$(cat expect3)" actual > /dev/null)
> '
>
> +# File/submodule conflict
> +# Commit O: <empty>
> +# Commit A: path (submodule)
> +# Commit B: path
> +# Expected: path/ is submodule and file contents for B's path are somewhere
> +
> +test_expect_success 'setup file/submodule conflict' '
> + test_create_repo file-submodule &&
> + (
> + cd file-submodule &&
> +
> + git commit --allow-empty -m O &&
> +
> + git branch A &&
> + git branch B &&
> +
> + git checkout B &&
> + echo contents >path &&
> + git add path &&
> + git commit -m B &&
> +
> + git checkout A &&
> + test_create_repo path &&
> + (
> + cd path &&
> +
> + echo hello >world &&
test_commit -C path &&
or do we need a dirty submodule specifically?
If so what is important, the untracked file or
would changes in the index be sufficient?
> + git add world &&
when observing this one in verbose mode , you may be
asked to use 'git submodule add' instead
https://github.com/git/git/blob/master/builtin/add.c#L323
> + git commit -m "submodule"
Not sure if we'd need the shell it is only test_commit,
the [submodule] add and commit, so maybe we can get away with
3 times -C ?
> +test_expect_failure 'file/submodule conflict' '
Which part fails here?
> + test_when_finished "git -C file-submodule reset --hard" &&
> + (
> + cd file-submodule &&
> +
> + git checkout A^0 &&
> + test_must_fail git merge B^0 >out 2>err &&
> +
> + git ls-files -s >out &&
> + test_line_count = 2 out &&
> + git ls-files -u >out &&
> + test_line_count = 2 out &&
> +
> + # path/ is still a submodule
> + test_path_is_dir path/.git &&
> +
> + echo Checking if contents from B:path showed up anywhere &&
This could be a comment instead?
> + grep -q content * 2>/dev/null
Ah that is why we needed the specific echo above.
Sorry for being dense here, I am not quite following the last part of the test,
as it is unclear what ought to fail in this test.
Thanks,
Stefan
