git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] bundle: Fix exclusion of annotated tags

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 4, 2014, 20:10 UTC
Message-ID
<xmqqvbq8qama.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1406968747-16100-2-git-send-email-git@cryptocrack.de>
Lukas Fleischer <git@cryptocrack.de> writes:
Show 24 quoted lines
> 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.
Show 16 quoted lines
>  	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 &&
Previous: Lukas FleischerNext: Junio C Hamano
Message 3 of 7 in “t5704: Fix the test that checks for excluded tags”
  1. 1/2 t5704: Fix the test that checks for excluded tagsLukas Fleischer, Aug 2, 2014
  2. 2/2 bundle: Fix exclusion of annotated tagsLukas Fleischer, Aug 2, 2014
  3. Junio C HamanoAug 4, 2014
  4. Junio C HamanoAug 4, 2014
  5. Junio C HamanoAug 4, 2014
  6. 1/2 t5704: Complement annotated tag exclusion testLukas Fleischer, Aug 4, 2014
  7. 2/2 bundle: Fix exclusion of annotated tagsLukas Fleischer, Aug 4, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.