b0d669c05b
When we use git hash-object --stdin with the --path option, Git applies filters to the object, so Git LFS is invoked. However, if the object provided is less than 1024 bytes in size, we would hang. This occurred because of our packet reader didn't quite implement the io.Reader interface completely: if it returned a non-zero value and io.EOF, the next call to Read would not return 0 and io.EOF. Instead, it would try to read from stdin, which would not be sending us more data until we provided a response, so we would hang. To solve this, keep track of the EOF and always return it on subsequent Read calls. In addition, don't process the callback to write the file in this case, since we don't actually want to write into the working tree.
140 lines
3.5 KiB
Bash
Executable File
140 lines
3.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
. "$(dirname "$0")/testlib.sh"
|
|
|
|
# HACK(taylor): git uses ".g<hash>" in the version name to signal that it is
|
|
# from the "next" branch, which is the only (current) version of Git that has
|
|
# support for the filter protocol.
|
|
#
|
|
ensure_git_version_isnt $VERSION_LOWER "2.11.0"
|
|
|
|
begin_test "filter process: checking out a branch"
|
|
(
|
|
set -e
|
|
|
|
reponame="filter_process_checkout"
|
|
setup_remote_repo "$reponame"
|
|
clone_repo "$reponame" repo
|
|
|
|
git lfs track "*.dat"
|
|
git add .gitattributes
|
|
git commit -m "initial commit"
|
|
|
|
contents_a="contents_a"
|
|
contents_a_oid="$(calc_oid $contents_a)"
|
|
printf "%s" "$contents_a" > a.dat
|
|
|
|
git add a.dat
|
|
git commit -m "add a.dat"
|
|
|
|
git checkout -b b
|
|
|
|
contents_b="contents_b"
|
|
contents_b_oid="$(calc_oid $contents_b)"
|
|
printf "%s" "$contents_b" > b.dat
|
|
|
|
git add b.dat
|
|
git commit -m "add b.dat"
|
|
|
|
git push origin --all
|
|
|
|
pushd ..
|
|
# Git will choose filter.lfs.process over `filter.lfs.clean` and
|
|
# `filter.lfs.smudge`
|
|
GIT_TRACE_PACKET=1 git \
|
|
-c "filter.lfs.process=git-lfs filter-process" \
|
|
-c "filter.lfs.clean=false"\
|
|
-c "filter.lfs.smudge=false" \
|
|
-c "filter.lfs.required=true" \
|
|
clone "$GITSERVER/$reponame" "$reponame-assert"
|
|
|
|
cd "$reponame-assert"
|
|
|
|
# Assert that we are on the "master" branch, and have a.dat
|
|
[ "master" = "$(git rev-parse --abbrev-ref HEAD)" ]
|
|
[ "$contents_a" = "$(cat a.dat)" ]
|
|
assert_pointer "master" "a.dat" "$contents_a_oid" 10
|
|
|
|
git checkout b
|
|
|
|
# Assert that we are on the "b" branch, and have b.dat
|
|
[ "b" = "$(git rev-parse --abbrev-ref HEAD)" ]
|
|
[ "$contents_b" = "$(cat b.dat)" ]
|
|
assert_pointer "b" "b.dat" "$contents_b_oid" 10
|
|
popd
|
|
)
|
|
end_test
|
|
|
|
begin_test "filter process: adding a file"
|
|
(
|
|
set -e
|
|
|
|
reponame="filter_process_add"
|
|
setup_remote_repo "$reponame"
|
|
clone_repo "$reponame" "$reponame"
|
|
|
|
git lfs track "*.dat"
|
|
git add .gitattributes
|
|
git commit -m "initial commit"
|
|
|
|
contents="contents"
|
|
contents_oid="$(calc_oid "$contents")"
|
|
printf "%s" "$contents" > a.dat
|
|
|
|
git add a.dat
|
|
|
|
expected="$(pointer "$contents_oid" "${#contents}")"
|
|
got="$(git cat-file -p :a.dat)"
|
|
|
|
diff -u <(echo "$expected") <(echo "$got")
|
|
)
|
|
end_test
|
|
|
|
# https://github.com/git-lfs/git-lfs/issues/1697
|
|
begin_test "filter process: add a file with 1024 bytes"
|
|
(
|
|
set -e
|
|
|
|
mkdir repo-issue-1697
|
|
cd repo-issue-1697
|
|
git init
|
|
git lfs track "*.dat"
|
|
dd if=/dev/zero of=first.dat bs=1024 count=1
|
|
printf "any contents" > second.dat
|
|
git add .
|
|
)
|
|
end_test
|
|
|
|
begin_test "filter process: hash-object --stdin --path does not hang"
|
|
(
|
|
set -e
|
|
|
|
mkdir repo-hash-object
|
|
cd repo-hash-object
|
|
git init
|
|
git lfs track "*.dat"
|
|
contents="test"
|
|
contents_oid="$(calc_oid "$contents")"
|
|
expected=$(pointer "$contents_oid" 4 | git hash-object --stdin)
|
|
|
|
dd if=/dev/zero of=first.dat bs=1000 count=1
|
|
echo a > second.dat
|
|
# Works for existing file longer than this one.
|
|
output=$(printf test | git hash-object --path first.dat --stdin)
|
|
[ "$expected" = "$output" ]
|
|
# Works for existing file shorter than this one.
|
|
output=$(printf test | git hash-object --path second.dat --stdin)
|
|
[ "$expected" = "$output" ]
|
|
# Works for absent file.
|
|
output=$(printf test | git hash-object --path third.dat --stdin)
|
|
[ "$expected" = "$output" ]
|
|
|
|
dd if=/dev/zero of=large.dat bs=65537 count=1
|
|
oid=$(calc_oid_file large.dat)
|
|
expected=$(pointer "$oid" 65537 | git hash-object --stdin)
|
|
output=$(git hash-object --path third.dat --stdin <large.dat)
|
|
[ "$expected" = "$output" ]
|
|
git add .
|
|
)
|
|
end_test
|