Lukas Fleischer <g...@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 <g...@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 &&
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to