All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] clean: style fix for 9f93e46 (git-clean: use a git-add-interactive ...)
Date: Tue, 06 Jan 2015 11:17:33 -0800	[thread overview]
Message-ID: <xmqq4ms3pvle.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1420464563-5579-1-git-send-email-pclouds@gmail.com> ("Nguyễn	Thái Ngọc Duy"'s message of "Mon, 5 Jan 2015 20:29:23 +0700")

Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:

> -	int (*fn)();
> +	int (*fn)(void);

This is an independent fix that has already been merged to 'maint',
but to any topic that forked before the merge happened I need to
apply the fix without committing it when I test it in isolation, and
I screwed up when I did that SQUASH??? in question by running a
casual "commit -a" (or perhaps "add -u").  My bad.

When your series (with the squash) is merged to any integration
branch, this hunk becomes redundant, so I'd remove it from the
SQUASH???

When I do a SQUASH???, I expect the original authors use it as a
hint in their rerolls, but because this series has seen no comments
so far (no interests???), I do not foresee or expect you to feel a
need for rerolling at this point.  If you agree that the remainder
of the SQUASH??? (shown below) is sensible, I'll turn it into a
"fixup!" for cc44d4fe (untracked cache: load from UNTR index
extension, 2014-12-08) and requeue.

Thanks for catching my mistake before it gets too old.

 dir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dir.c b/dir.c
index ef58547..95ff3f0 100644
--- a/dir.c
+++ b/dir.c
@@ -2459,7 +2459,7 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long
 	const struct ondisk_untracked_cache *ouc;
 	struct untracked_cache *uc;
 	struct read_data rd;
-	const unsigned char *next = data, *end = data + sz;
+	const unsigned char *next = data, *end = (const unsigned char *)data + sz;
 	struct strbuf sb = STRBUF_INIT;
 	int len;
 

  reply	other threads:[~2015-01-06 19:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-05 13:29 [PATCH] clean: style fix for 9f93e46 (git-clean: use a git-add-interactive ...) Nguyễn Thái Ngọc Duy
2015-01-06 19:17 ` Junio C Hamano [this message]
2015-01-07 12:35   ` Duy Nguyen

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=xmqq4ms3pvle.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=pclouds@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.