summaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorLukas Fleischer <git@cryptocrack.de>2014-08-02 08:39:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-08-07 22:35:25 (GMT)
commit2c8544ab91812c264666c9feb335ce3091fa29c1 (patch)
tree229f93a11edfdf30ea268966fcf3907e0ca83122 /bundle.c
parente6aaa393478bf3ee9f4cde8d82cd258c034cd335 (diff)
downloadgit-2c8544ab91812c264666c9feb335ce3091fa29c1.zip
git-2c8544ab91812c264666c9feb335ce3091fa29c1.tar.gz
git-2c8544ab91812c264666c9feb335ce3091fa29c1.tar.bz2
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 <git@cryptocrack.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundle.c b/bundle.c
index 3d64311..8b3b80e 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);