kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2014-08-26 11:16:25 -07:00
parent 212d781c96 f7f91086a3
commit a3d54f9a1f
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/pack-objects.c
View File

@ -2494,6 +2494,7 @@ static void get_object_list(int ac, const char **av)
if (get_sha1_hex(line + 10, sha1))
die("not an SHA-1 '%s'", line + 10);
register_shallow(sha1);
use_bitmap_index = 0;
continue;
}
die("not a rev '%s'", line);

39
t/t5311-pack-bitmaps-shallow.sh Executable file
View File

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