mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 15:16:11 +02:00
Code

Merge branch 'lf/bundle-exclusion' into maint 

* lf/bundle-exclusion:
  bundle: fix exclusion of annotated tags
This commit is contained in:
Junio C Hamano 2014-09-19 14:05:11 -07:00
parent bb6ac5ea13 2c8544ab91
commit ffe41f8d32
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundle.c
View File

@ -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);

5
t/t5704-bundle.sh
View File

@ -14,7 +14,10 @@ test_expect_success 'setup' '
git tag -d third
'
test_expect_success '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 &&
git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 &&
git ls-remote bundle > output &&
! grep tag output