mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/left-right-bitmap'

Browse Source 
When called with '--left-right' and '--use-bitmap-index', 'rev-list'
will produce output without any left/right markers, which has been
corrected.

* jk/left-right-bitmap:
  rev-list: skip bitmap traversal for --left-right
This commit is contained in:
Junio C Hamano
2024-11-08 12:56:28 +09:00
parent 1ee7dbde67 16a186fede
commit 02a2d5706d
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/rev-list.c
View File

@ -485,6 +485,13 @@ static int try_bitmap_traversal(struct rev_info *revs,
if (revs->max_count >= 0) if (revs->max_count >= 0)
return -1; return -1;
/*
* We can't know which commits were left/right in a single traversal,
* and we don't yet know how to traverse them separately.
*/
if (revs->left_right)
return -1;
bitmap_git = prepare_bitmap_walk(revs, filter_provided_objects); bitmap_git = prepare_bitmap_walk(revs, filter_provided_objects);
if (!bitmap_git) if (!bitmap_git)
return -1; return -1;

12
t/t5310-pack-bitmaps.sh
View File

@ -503,6 +503,18 @@ test_expect_success 'boundary-based traversal is used when requested' '
done done
' '
test_expect_success 'left-right not confused by bitmap index' '
git rev-list --left-right other...HEAD >expect &&
git rev-list --use-bitmap-index --left-right other...HEAD >actual &&
test_cmp expect actual
'
test_expect_success 'left-right count not confused by bitmap-index' '
git rev-list --left-right --count other...HEAD >expect &&
git rev-list --use-bitmap-index --left-right --count other...HEAD >actual &&
test_cmp expect actual
'
test_bitmap_cases "pack.writeBitmapLookupTable" test_bitmap_cases "pack.writeBitmapLookupTable"
test_expect_success 'verify writing bitmap lookup table when enabled' ' test_expect_success 'verify writing bitmap lookup table when enabled' '