From 2c8544ab91812c264666c9feb335ce3091fa29c1 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sat, 2 Aug 2014 10:39:06 +0200 Subject: bundle: fix exclusion of annotated tags 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. Also cover this behavior with an additional test. Signed-off-by: Lukas Fleischer Signed-off-by: Junio C Hamano --- bundle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bundle.c') diff --git a/bundle.c b/bundle.c index 3d6431137..8b3b80edd 100644 --- a/bundle.c +++ b/bundle.c @@ -223,8 +223,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); if (!line++) return 1; date = strtoul(line, NULL, 10); -- cgit v1.2.1