The command does nothing, so it's not needed. There is also a typo in
my patch description, so I'll resend it again with needed changes.
--
Regards,
Vasily Titskiy
On Tue, May 17, 2016 at 1:04 PM, Junio C Hamano wrote:
> Vasily Titskiy writes:
>
>> You're right, it's redundant here. Should
Vasily Titskiy writes:
> You're right, it's redundant here. Should I resubmit the path without this
> line?
I wasn't pointing out that it was not needed. I was only asking
what it was meant to do.
If you now think it shouldn't have been there, that merely means
your code was wrong. It does n
On Tue, May 17, 2016 at 9:16 AM, Vasily Titskiy wrote:
> As stash does not know how to deal with submodules,
> it should not try to save/restore their states
> as it leads to redundant merge conflicts.
>
> Added test checks if 'stash pop' does not trigger merge conflics
/conflics/conflicts/
> in
Hi Junio,
You're right, it's redundant here. Should I resubmit the path without this line?
--
Regards,
Vasily Titskiy
On Tue, May 17, 2016 at 12:15 PM, Junio C Hamano wrote:
>
> Vasily Titskiy writes:
>
> > diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> > index 2142c1f..1be62f3 100755
Vasily Titskiy writes:
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index 2142c1f..1be62f3 100755
> --- a/t/t3903-stash.sh
> +++ b/t/t3903-stash.sh
> @@ -731,4 +731,38 @@ test_expect_success 'stash list --cc shows combined
> diff' '
> test_cmp expect actual
> '
>
> +test_expect_
As stash does not know how to deal with submodules,
it should not try to save/restore their states
as it leads to redundant merge conflicts.
Added test checks if 'stash pop' does not trigger merge conflics
in submodules.
Signed-off-by: Vasily Titskiy
---
git-stash.sh | 2 +-
t/t3903-stash.
6 matches
Mail list logo
