From: Jonathan Tan <jonathantanmy@xxxxxxxxxx>
As part of an effort to improve Git support for very large repositories
in which clients typically have only a subset of all version-controlled
blobs, test pack-objects support for --filter=blobs:limit=<n>, packing only
blobs not exceeding that size unless the blob corresponds to a file
whose name starts with ".git". upload-pack will eventually be taught to
use this new parameter if needed to exclude certain blobs during a fetch
or clone, potentially drastically reducing network consumption when
serving these very large repositories.
Signed-off-by: Jonathan Tan <jonathantanmy@xxxxxxxxxx>
Signed-off-by: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
---
t/t5300-pack-object.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++
t/test-lib-functions.sh | 12 ++++++++++++
2 files changed, 57 insertions(+)
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 9c68b99..0739a07 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -457,6 +457,51 @@ test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack.
grep -F "no threads support, ignoring pack.threads" err
'
+lcut () {
+ perl -e '$/ = undef; $_ = <>; s/^.{'$1'}//s; print $_'
+}
+
+test_expect_success 'filtering by size works with multiple excluded' '
+ rm -rf server &&
+ git init server &&
+ printf a > server/a &&
+ printf b > server/b &&
+ printf c-very-long-file > server/c &&
+ printf d-very-long-file > server/d &&
+ git -C server add a b c d &&
+ git -C server commit -m x &&
+
+ git -C server rev-parse HEAD >objects &&
+ git -C server pack-objects --revs --stdout --filter=blobs:limit=10 <objects >my.pack &&
+
+ # Ensure that only the small blobs are in the packfile
+ git index-pack my.pack &&
+ git verify-pack -v my.idx >objectlist &&
+ grep $(git hash-object server/a) objectlist &&
+ grep $(git hash-object server/b) objectlist &&
+ ! grep $(git hash-object server/c) objectlist &&
+ ! grep $(git hash-object server/d) objectlist
+'
+
+test_expect_success 'filtering by size never excludes special files' '
+ rm -rf server &&
+ git init server &&
+ printf a-very-long-file > server/a &&
+ printf a-very-long-file > server/.git-a &&
+ printf b-very-long-file > server/b &&
+ git -C server add a .git-a b &&
+ git -C server commit -m x &&
+
+ git -C server rev-parse HEAD >objects &&
+ git -C server pack-objects --revs --stdout --filter=blobs:limit=10 <objects >my.pack &&
+
+ # Ensure that the .git-a blob is in the packfile, despite also
+ # appearing as a non-.git file
+ git index-pack my.pack &&
+ git verify-pack -v my.idx >objectlist &&
+ grep $(git hash-object server/a) objectlist
+'
+
#
# WARNING!
#
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 1701fe2..07b79c7 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -1020,3 +1020,15 @@ nongit () {
"$@"
)
}
+
+# Converts big-endian pairs of hexadecimal digits into bytes. For example,
+# "printf 61620d0a | hex_pack" results in "ab\r\n".
+hex_pack () {
+ perl -e '$/ = undef; $input = <>; print pack("H*", $input)'
+}
+
+# Converts bytes into big-endian pairs of hexadecimal digits. For example,
+# "printf 'ab\r\n' | hex_unpack" results in "61620d0a".
+hex_unpack () {
+ perl -e '$/ = undef; $input = <>; print unpack("H2" x length($input), $input)'
+}
--
2.9.3
