diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-08-26 22:16:25 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-08-26 22:16:25 +0400 |
commit | a3d54f9a1fa481727a849b8753fc9d1abafe6583 (patch) | |
tree | 0b587d35e77310dd8fdcf6bb8990a525cd189710 /t | |
parent | 212d781c967317a05a704609ddf3ffc8a09f8590 (diff) | |
parent | f7f91086a376ba53f8270ea80b7bbbd8274c3c2d (diff) |
Merge branch 'jk/pack-shallow-always-without-bitmap'
Reachability bitmaps do not work with shallow operations.
Fixes regression in 2.0.
* jk/pack-shallow-always-without-bitmap:
pack-objects: turn off bitmaps when we see --shallow lines
Diffstat (limited to 't')
-rwxr-xr-x | t/t5311-pack-bitmaps-shallow.sh | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/t/t5311-pack-bitmaps-shallow.sh b/t/t5311-pack-bitmaps-shallow.sh new file mode 100755 index 0000000000..872a95df33 --- /dev/null +++ b/t/t5311-pack-bitmaps-shallow.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +test_description='check bitmap operation with shallow repositories' +. ./test-lib.sh + +# We want to create a situation where the shallow, grafted +# view of reachability does not match reality in a way that +# might cause us to send insufficient objects. +# +# We do this with a history that repeats a state, like: +# +# A -- B -- C +# file=1 file=2 file=1 +# +# and then create a shallow clone to the second commit, B. +# In a non-shallow clone, that would mean we already have +# the tree for A. But in a shallow one, we've grafted away +# A, and fetching A to B requires that the other side send +# us the tree for file=1. +test_expect_success 'setup shallow repo' ' + echo 1 >file && + git add file && + git commit -m orig && + echo 2 >file && + git commit -a -m update && + git clone --no-local --bare --depth=1 . shallow.git && + echo 1 >file && + git commit -a -m repeat +' + +test_expect_success 'turn on bitmaps in the parent' ' + git repack -adb +' + +test_expect_success 'shallow fetch from bitmapped repo' ' + (cd shallow.git && git fetch) +' + +test_done |