git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lukas Fleischer <git@cryptocrack.de>
To: git@vger.kernel.org
Subject: [PATCH 2/2] bundle: Fix exclusion of annotated tags
Date: Mon,  4 Aug 2014 22:57:03 +0200	[thread overview]
Message-ID: <1407185823-9950-2-git-send-email-git@cryptocrack.de> (raw)
In-Reply-To: <1407185823-9950-1-git-send-email-git@cryptocrack.de>

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);
 	if (!line++)
 		return 1;
 	date = strtoul(line, NULL, 10);
diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh
index 2d53388..a828c71 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 'tags can be excluded by rev-list options' '
+test_expect_success '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 &&
-- 
2.0.4

      reply	other threads:[~2014-08-04 20:57 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
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   ` Lukas Fleischer [this message]

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=1407185823-9950-2-git-send-email-git@cryptocrack.de \
    --to=git@cryptocrack.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).