From: Junio C Hamano <gitster@pobox•com>
To: Lukas Fleischer <git@cryptocrack•de>
Cc: git@vger•kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx•de>
Subject: Re: [PATCH 2/2] bundle: Fix exclusion of annotated tags
Date: Mon, 04 Aug 2014 13:10:37 -0700 [thread overview]
Message-ID: <xmqqvbq8qama.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1406968747-16100-2-git-send-email-git@cryptocrack.de> (Lukas Fleischer's message of "Sat, 2 Aug 2014 10:39:07 +0200")
Lukas Fleischer <git@cryptocrack•de> writes:
> In commit c9a42c4 (bundle: allow rev-list options to exclude annotated
> tags, 2009-01-02), support for excluding annotated tags outside the
> specified date range was added. However, the wrong order of parameters
> was chosen when calling memchr(). Fix this by swapping the character to
> search for with the maximum length parameter.
>
> Signed-off-by: Lukas Fleischer <git@cryptocrack•de>
> ---
> bundle.c | 4 ++--
> t/t5704-bundle.sh | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/bundle.c b/bundle.c
> index 71a21a6..b708906 100644
> --- a/bundle.c
> +++ b/bundle.c
> @@ -221,8 +221,8 @@ static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
> line = memmem(buf, size, "\ntagger ", 8);
> if (!line++)
> return 1;
> - lineend = memchr(line, buf + size - line, '\n');
> - line = memchr(line, lineend ? lineend - line : buf + size - line, '>');
> + lineend = memchr(line, '\n', buf + size - line);
> + line = memchr(line, '>', lineend ? lineend - line : buf + size - line);
Good spotting; thanks.
> if (!line++)
> return 1;
> date = strtoul(line, NULL, 10);
> diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh
> index 2f063ea..8a4d299 100755
> --- a/t/t5704-bundle.sh
> +++ b/t/t5704-bundle.sh
> @@ -14,7 +14,7 @@ test_expect_success 'setup' '
> git tag -d third
> '
>
> -test_expect_failure 'annotated tags can be excluded by rev-list options' '
> +test_expect_success 'annotated tags can be excluded by rev-list options' '
> git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 &&
> git ls-remote bundle > output &&
> grep tag output &&
next prev parent reply other threads:[~2014-08-04 20:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-02 8:39 [PATCH 1/2] t5704: Fix the test that checks for excluded tags Lukas Fleischer
2014-08-02 8:39 ` [PATCH 2/2] bundle: Fix exclusion of annotated tags Lukas Fleischer
2014-08-04 20:10 ` Junio C Hamano [this message]
2014-08-04 20:08 ` [PATCH 1/2] t5704: Fix the test that checks for excluded tags Junio C Hamano
2014-08-04 20:28 ` Junio C Hamano
2014-08-04 20:57 ` [PATCH 1/2] t5704: Complement annotated tag exclusion test Lukas Fleischer
2014-08-04 20:57 ` [PATCH 2/2] bundle: Fix exclusion of annotated tags Lukas Fleischer
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=xmqqvbq8qama.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@cryptocrack$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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