From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Joey Hess <joeyh@debian.org>,
git@vger.kernel.org
Subject: Re: [regression] Re: git-cat-file --batch reversion; cannot query filenames with spaces
Date: Sat, 3 Aug 2013 00:18:42 -0700 [thread overview]
Message-ID: <20130803071842.GB26894@sigill.intra.peff.net> (raw)
In-Reply-To: <7vmwp0osic.fsf@alter.siamese.dyndns.org>
On Fri, Aug 02, 2013 at 11:30:03AM -0700, Junio C Hamano wrote:
> > I didn't see the result of your wrangling in pu, but I will keep an eye
> > out to double-check it (unless you did not finish, in which case I am
> > happy to do the wrangling myself).
>
> Here is what is on top of the revert that has been pushed out on
> 'pu'.
Thanks, that looks good to me.
We may want to also squash in the patch below, which puts the pointer
variable in the most-local block and re-wraps the newly indented comment
for line length. Neither introduced by your adaptation, but they became
more obvious to me when seen on top of the revert.
-Peff
---
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 07b4818..41afaa5 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -286,15 +286,15 @@ static int batch_objects(struct batch_options *opt)
warn_on_object_refname_ambiguity = 0;
while (strbuf_getline(&buf, stdin, '\n') != EOF) {
- char *p;
int error;
if (data.split_on_whitespace) {
/*
- * Split at first whitespace, tying off the beginning of the
- * string and saving the remainder (or NULL) in data.rest.
+ * Split at first whitespace, tying off the beginning
+ * of the string and saving the remainder (or NULL) in
+ * data.rest.
*/
- p = strpbrk(buf.buf, " \t");
+ char *p = strpbrk(buf.buf, " \t");
if (p) {
while (*p && strchr(" \t", *p))
*p++ = '\0';
next prev parent reply other threads:[~2013-08-03 7:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20130801201842.GA16809@kitenet.net>
2013-08-02 6:40 ` [regression] Re: git-cat-file --batch reversion; cannot query filenames with spaces Jonathan Nieder
2013-08-02 10:54 ` Jeff King
2013-08-02 11:59 ` Jeff King
2013-08-02 15:27 ` Joey Hess
2013-08-02 16:14 ` Brandon Casey
2013-08-02 16:41 ` Junio C Hamano
2013-08-02 17:28 ` Jeff King
2013-08-02 18:30 ` Junio C Hamano
2013-08-02 20:05 ` Jonathan Nieder
2013-08-03 7:18 ` Jeff King [this message]
2013-08-02 16:32 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130803071842.GB26894@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=joeyh@debian.org \
--cc=jrnieder@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).