Re: [PATCH v2 09/12] t7406: use "git pull" instead of "git pull --rebase"

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH v2 09/12] t7406: use "git pull" instead of "git pull --rebase"

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:04:41

Paul Tan [off-list ref] writes:
Hi,

On Fri, May 8, 2015 at 1:24 AM, Junio C Hamano [off-list ref] wrote:
quoted
Paul Tan [off-list ref] writes:
If 'git pull' gets broken, it will break this test _anyway_.
You have a point, perhaps this should be changed to git-fetch + git-merge?

Well my reasoning is that it's because git-pull --rebase requires more
code to be implemented than git-pull. So I'm thinking that git-pull
--rebase is more likely to break than git-pull.
quoted
Unless
the operating assumption is "it is OK to break 'git pull --rebase',
as long as we do not break 'git pull', while rewriting it", I am not
sure the value of the change in this patch.  We'd need to keep both
form working, no?
Yes, ultimately the git-pull rewrite must re-implement everything, but
if this test suite is affected by any git-pull (--rebase) breakage,
then there will be lots of patch noise as this test suite's tests get
disabled/re-enabled in the git-pull rewrite patches.

But if the patch noise is okay, then I'm fine with dropping this patch
and 07/12.
I am not sure what you mean by "patch noise".

I do not think touching this test which does not have anything to do
with "git pull" in your series is sensible at all, and you shouldn't
flip test_expect_success temporarily to _expect_failure, if that is
what you have in mind.

Just don't run unrelated tests while your series is in flux.

Re: [PATCH v2 09/12] t7406: use "git pull" instead of "git pull --rebase"

From: Paul Tan <hidden>
Date: 2016-06-15 23:04:42

Hi Junio,

On Fri, May 8, 2015 at 4:15 AM, Junio C Hamano [off-list ref] wrote:
I do not think touching this test which does not have anything to do
with "git pull" in your series is sensible at all, and you shouldn't
flip test_expect_success temporarily to _expect_failure, if that is
what you have in mind.

Just don't run unrelated tests while your series is in flux.
Yes, you are right, these patches are not related to the topic at all,
and I will drop them.

Just to make myself clear though, the issue I have is that
git-submodule and the various diff commands do not depend on
git-pull's functionality at all. If only git-pull breaks, these
command will continue to work perfectly. However, if all the tests in
t7406 and t4013 break as well, I would consider that misrepresenting
the problem.

Not that this is really a big problem anyway, the entire failing test
suites just surprised me, that's all. Sorry for the noise.

Thanks,
Paul
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help