Skip to content

Commit ffe41f8

Browse files
committed
Merge branch 'lf/bundle-exclusion' into maint
* lf/bundle-exclusion: bundle: fix exclusion of annotated tags
2 parents bb6ac5e + 2c8544a commit ffe41f8

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

bundle.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
221221
line = memmem(buf, size, "\ntagger ", 8);
222222
if (!line++)
223223
return 1;
224-
lineend = memchr(line, buf + size - line, '\n');
225-
line = memchr(line, lineend ? lineend - line : buf + size - line, '>');
224+
lineend = memchr(line, '\n', buf + size - line);
225+
line = memchr(line, '>', lineend ? lineend - line : buf + size - line);
226226
if (!line++)
227227
return 1;
228228
date = strtoul(line, NULL, 10);

t/t5704-bundle.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ test_expect_success 'setup' '
1414
git tag -d third
1515
'
1616

17-
test_expect_success 'tags can be excluded by rev-list options' '
17+
test_expect_success 'annotated tags can be excluded by rev-list options' '
18+
git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 &&
19+
git ls-remote bundle > output &&
20+
grep tag output &&
1821
git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 &&
1922
git ls-remote bundle > output &&
2023
! grep tag output

0 commit comments

Comments
 (0)