From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j6t@kdbg.org>,
Git Mailing List <git@vger.kernel.org>,
Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: [PATCH 2/2] submodule-helper: fix indexing in clone retry error reporting path
Date: Fri, 22 Jul 2016 13:00:53 -0700 [thread overview]
Message-ID: <CAGZ79kaoxo9qM-r9nNzG8GV4aCfun4RaK8jpsdSgbyix1bJBFg@mail.gmail.com> (raw)
In-Reply-To: <xmqq60rxa1sl.fsf@gitster.mtv.corp.google.com>
On Fri, Jul 22, 2016 at 12:52 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> The approach to tests is different though. I like yours better than mine,
>> as it doesn't add more tests, but strengthens existing tests.
>
> So... are you retracting
> http://thread.gmane.org/gmane.comp.version-control.git/299995 and
> instead giving an Ack to these two?
>
I like this series better
* for the approach
* for the tests
* for the commit message
So I do think this should be applied instead of what I sent.
I am tempted to send a squash proposal like:
(broken whitespaces)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 6f6d67a..77be97e 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -796,6 +796,8 @@ static int update_clone_task_finished(int result,
return 0;
} else {
idx -= suc->list.nr;
+ if (idx >= suc->failed_clones_nr)
+ die("BUG: idx too large???");
ce = suc->failed_clones[idx];
strbuf_addf(err, _("Failed to clone '%s' a second time, aborting"),
ce->name);
next prev parent reply other threads:[~2016-07-22 20:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-22 19:14 [PATCH 1/2] git-submodule: forward exit code of git-submodule--helper more faithfully Johannes Sixt
2016-07-22 19:15 ` [PATCH 2/2] submodule-helper: fix indexing in clone retry error reporting path Johannes Sixt
2016-07-22 19:30 ` Stefan Beller
2016-07-22 19:52 ` Junio C Hamano
2016-07-22 20:00 ` Stefan Beller [this message]
2016-07-22 19:39 ` Junio C Hamano
2016-07-22 19:50 ` Stefan Beller
2016-07-22 20:00 ` Junio C Hamano
2016-07-22 19:27 ` [PATCH 1/2] git-submodule: forward exit code of git-submodule--helper more faithfully Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGZ79kaoxo9qM-r9nNzG8GV4aCfun4RaK8jpsdSgbyix1bJBFg@mail.gmail.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).