lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9fad6ff488
git-lfs/t/t-push.sh

875 lines
25 KiB
Bash
Raw Normal View History

update the shebang lines to use bash
2015-07-30 02:37:31 +00:00
#!/usr/bin/env bash
port push tests
2015-05-26 21:09:24 +00:00
t: load shell scripts from $(dirname) instead of 't'
2018-07-10 18:48:02 +00:00
. "$(dirname "$0")/testlib.sh"
port push tests
2015-05-26 21:09:24 +00:00
test/test-push.sh: extract test setup Extract the repo setup for the first few push tests into a separate function.
2018-07-20 23:46:33 +00:00
# sets up the repos for the first few push tests. The passed argument is the
# name of the repo to setup. The resuling repo will have a local file tracked
# with LFS and committed, but not yet pushed to the remote
push_repo_setup() {
reponame="$1"
tq, commands: send refspec on batch upload calls
2018-01-05 18:12:57 +00:00
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
git config "lfs.$(repo_endpoint "$GITSERVER" "$reponame").locksverify" false
git lfs track "*.dat"
echo "push a" > a.dat
git add .gitattributes a.dat
git commit -m "add a.dat"
test/test-push.sh: extract test setup Extract the repo setup for the first few push tests into a separate function.
2018-07-20 23:46:33 +00:00
}
begin_test "push with good ref"
(
set -e
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
push_repo_setup "push-main-branch-required"
tq, commands: send refspec on batch upload calls
2018-01-05 18:12:57 +00:00
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push origin main
tq, commands: send refspec on batch upload calls
2018-01-05 18:12:57 +00:00
)
end_test
begin_test "push with tracked ref"
(
set -e
test/test-push.sh: extract test setup Extract the repo setup for the first few push tests into a separate function.
2018-07-20 23:46:33 +00:00
push_repo_setup "push-tracked-branch-required"
tq, commands: send refspec on batch upload calls
2018-01-05 18:12:57 +00:00
git config push.default upstream
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git config branch.main.merge refs/heads/tracked
git lfs push origin main
tq, commands: send refspec on batch upload calls
2018-01-05 18:12:57 +00:00
)
end_test
begin_test "push with bad ref"
(
set -e
test/test-push.sh: extract test setup Extract the repo setup for the first few push tests into a separate function.
2018-07-20 23:46:33 +00:00
push_repo_setup "push-other-branch-required"
tq, commands: send refspec on batch upload calls
2018-01-05 18:12:57 +00:00
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push origin main 2>&1 | tee push.log
tq, commands: send refspec on batch upload calls
2018-01-05 18:12:57 +00:00
if [ "0" -eq "${PIPESTATUS[0]}" ]; then
echo "expected command to fail"
exit 1
fi
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
grep 'batch response: Expected ref "refs/heads/other", got "refs/heads/main"' push.log
tq, commands: send refspec on batch upload calls
2018-01-05 18:12:57 +00:00
)
end_test
commands/command_push.go: set pushRemote When performing `git lfs push`, use the provided arguments to set the `pushRemote` instead of the `remote`.
2018-07-20 23:38:39 +00:00
begin_test "push with given remote, configured pushRemote"
(
set -e
test/test-push.sh: extract test setup Extract the repo setup for the first few push tests into a separate function.
2018-07-20 23:46:33 +00:00
push_repo_setup "push-given-and-config"
commands/command_push.go: set pushRemote When performing `git lfs push`, use the provided arguments to set the `pushRemote` instead of the `remote`.
2018-07-20 23:38:39 +00:00
git remote add bad-remote "invalid-url"
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git config branch.main.pushRemote bad-remote
commands/command_push.go: set pushRemote When performing `git lfs push`, use the provided arguments to set the `pushRemote` instead of the `remote`.
2018-07-20 23:38:39 +00:00
git lfs push --all origin
)
end_test
port push tests
2015-05-26 21:09:24 +00:00
begin_test "push"
(
set -e
reponame="$(basename "$0" ".sh")"
setup_remote_repo "$reponame"
clone_repo "$reponame" repo
test/test-push: set locksverify to true to fix tests
2017-02-16 20:10:05 +00:00
git config "lfs.$(repo_endpoint "$GITSERVER" "$reponame").locksverify" true
port push tests
2015-05-26 21:09:24 +00:00
git lfs track "*.dat"
echo "push a" > a.dat
git add .gitattributes a.dat
git commit -m "add a.dat"
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push --dry-run origin main 2>&1 | tee push.log
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
grep "push 4c48d2a6991c9895bcddcf027e1e4907280bcf21975492b1afbade396d6a3340 => a.dat" push.log
t: tighten regular expression in push test In this test, we look for certain lines beginning with "push" by grepping through the log for lines which contain the word "push". While that works now, in the future, the credential helper will start to prattle to standard error. In doing so, it will print the name of the repo, which includes the word "push". To avoid test failures, tighten up the regexp to match only at the beginning of the line and only when there's a space following "push".
2018-09-18 20:38:19 +00:00
[ $(grep -c "^push " push.log) -eq 1 ]
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push origin main 2>&1 | tee push.log
tq: new progress meter formatting
2018-01-06 02:01:50 +00:00
grep "Uploading LFS objects: 100% (1/1), 7 B" push.log
port push tests
2015-05-26 21:09:24 +00:00
git checkout -b push-b
echo "push b" > b.dat
git add b.dat
git commit -m "add b.dat"
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
git lfs push --dry-run origin push-b 2>&1 | tee push.log
grep "push 4c48d2a6991c9895bcddcf027e1e4907280bcf21975492b1afbade396d6a3340 => a.dat" push.log
grep "push 82be50ad35070a4ef3467a0a650c52d5b637035e7ad02c36652e59d01ba282b7 => b.dat" push.log
t: tighten regular expression in push test In this test, we look for certain lines beginning with "push" by grepping through the log for lines which contain the word "push". While that works now, in the future, the credential helper will start to prattle to standard error. In doing so, it will print the name of the repo, which includes the word "push". To avoid test failures, tighten up the regexp to match only at the beginning of the line and only when there's a space following "push".
2018-09-18 20:38:19 +00:00
[ $(grep -c "^push " < push.log) -eq 2 ]
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
# simulate remote ref
mkdir -p .git/refs/remotes/origin
git rev-parse HEAD > .git/refs/remotes/origin/HEAD
git lfs push --dry-run origin push-b 2>&1 | tee push.log
t: tighten regular expression in push test In this test, we look for certain lines beginning with "push" by grepping through the log for lines which contain the word "push". While that works now, in the future, the credential helper will start to prattle to standard error. In doing so, it will print the name of the repo, which includes the word "push". To avoid test failures, tighten up the regexp to match only at the beginning of the line and only when there's a space following "push".
2018-09-18 20:38:19 +00:00
[ $(grep -c "^push " push.log) -eq 0 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
rm -rf .git/refs/remotes
fix push and pre-push tests
2015-05-27 20:18:02 +00:00
git lfs push origin push-b 2>&1 | tee push.log
tq: new progress meter formatting
2018-01-06 02:01:50 +00:00
grep "Uploading LFS objects: 100% (2/2), 14 B" push.log
port push tests
2015-05-26 21:09:24 +00:00
)
end_test
t/t-push.sh: do not short-circuit --all tests Since commit df2007d81c7e5487c448e8d967707e5548bb10e3 in PR #646 it appears that the push_all_setup() helper function has accidentally short-circuited all but the first test calling it by exiting early with an exit code of 0 when the test repo exists. The calling tests thus appear to pass but are instead skipping all of their actual test logic. The original intent appears to have been to reuse a single test repo for the set of related tests of the --all push option. However, these tests do not leave the repo state in the same condition created by push_all_setup(), e.g., they replace the "origin" remote, and most importantly they each remove an LFS object file. Thus simply replacing "exit 0" with "return 0" in push_all_setup() is insufficient. To simplify matters, we no longer try to reuse the test repos between tests. Rather, we let push_all_setup() create a unique test repo for each caller by appending the distinct suffix argument provided by the caller to the name of the test repo. We then have to account for the fact that these tests have not fully run in some time, and therefore missed changes like commit db4e3b271d08da8110be0ee0ee091a2f9f212fbc in PR #2811 which updated the Git LFS progress meter output format. Several calls to "git push" also need adjustment to avoid errors such as "--all can't be combined with refspecs" and "tag shorthand without <tag>", and one short-circuited test had an incorrect count of "push ... => file1.dat" lines which we revise.
2020-11-17 06:31:44 +00:00
# helper used by the next few push --all tests to set up their repos
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
push_all_setup() {
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
suffix="$1"
t/t-push.sh: do not short-circuit --all tests Since commit df2007d81c7e5487c448e8d967707e5548bb10e3 in PR #646 it appears that the push_all_setup() helper function has accidentally short-circuited all but the first test calling it by exiting early with an exit code of 0 when the test repo exists. The calling tests thus appear to pass but are instead skipping all of their actual test logic. The original intent appears to have been to reuse a single test repo for the set of related tests of the --all push option. However, these tests do not leave the repo state in the same condition created by push_all_setup(), e.g., they replace the "origin" remote, and most importantly they each remove an LFS object file. Thus simply replacing "exit 0" with "return 0" in push_all_setup() is insufficient. To simplify matters, we no longer try to reuse the test repos between tests. Rather, we let push_all_setup() create a unique test repo for each caller by appending the distinct suffix argument provided by the caller to the name of the test repo. We then have to account for the fact that these tests have not fully run in some time, and therefore missed changes like commit db4e3b271d08da8110be0ee0ee091a2f9f212fbc in PR #2811 which updated the Git LFS progress meter output format. Several calls to "git push" also need adjustment to avoid errors such as "--all can't be combined with refspecs" and "tag shorthand without <tag>", and one short-circuited test had an incorrect count of "push ... => file1.dat" lines which we revise.
2020-11-17 06:31:44 +00:00
reponame="$(basename "$0" ".sh")-all-$suffix"
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
content1="initial"
content2="update"
content3="branch"
content4="tagged"
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
content5="main"
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
extracontent="extra"
introduce calc_oid() helper for integration tests
2015-09-21 17:50:22 +00:00
oid1=$(calc_oid "$content1")
oid2=$(calc_oid "$content2")
oid3=$(calc_oid "$content3")
oid4=$(calc_oid "$content4")
oid5=$(calc_oid "$content5")
extraoid=$(calc_oid "$extracontent")
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
t/t-push.sh: do not short-circuit --all tests Since commit df2007d81c7e5487c448e8d967707e5548bb10e3 in PR #646 it appears that the push_all_setup() helper function has accidentally short-circuited all but the first test calling it by exiting early with an exit code of 0 when the test repo exists. The calling tests thus appear to pass but are instead skipping all of their actual test logic. The original intent appears to have been to reuse a single test repo for the set of related tests of the --all push option. However, these tests do not leave the repo state in the same condition created by push_all_setup(), e.g., they replace the "origin" remote, and most importantly they each remove an LFS object file. Thus simply replacing "exit 0" with "return 0" in push_all_setup() is insufficient. To simplify matters, we no longer try to reuse the test repos between tests. Rather, we let push_all_setup() create a unique test repo for each caller by appending the distinct suffix argument provided by the caller to the name of the test repo. We then have to account for the fact that these tests have not fully run in some time, and therefore missed changes like commit db4e3b271d08da8110be0ee0ee091a2f9f212fbc in PR #2811 which updated the Git LFS progress meter output format. Several calls to "git push" also need adjustment to avoid errors such as "--all can't be combined with refspecs" and "tag shorthand without <tag>", and one short-circuited test had an incorrect count of "push ... => file1.dat" lines which we revise.
2020-11-17 06:31:44 +00:00
clone_repo "$reponame" "push-all-$suffix"
test/test-push: set locksverify to true to fix tests
2017-02-16 20:10:05 +00:00
git config "lfs.$(repo_endpoint "$GITSERVER" "$reponame").locksverify" true
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
git lfs track "*.dat"
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
echo "[
{
\"CommitDate\":\"$(get_date -6m)\",
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content1},\"Data\":\"$content1\"}
]
},
{
\"CommitDate\":\"$(get_date -5m)\",
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content2},\"Data\":\"$content2\"}
]
},
{
\"CommitDate\":\"$(get_date -4m)\",
\"NewBranch\":\"branch\",
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content3},\"Data\":\"$content3\"}
]
},
{
\"CommitDate\":\"$(get_date -4m)\",
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
\"ParentBranches\":[\"main\"],
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
\"Tags\":[\"tag\"],
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content4},\"Data\":\"$content4\"}
]
},
{
\"CommitDate\":\"$(get_date -2m)\",
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content5},\"Data\":\"$content5\"},
{\"Filename\":\"file2.dat\",\"Size\":${#extracontent},\"Data\":\"$extracontent\"}
]
}
]" | lfstest-testutils addcommits
git rm file2.dat
git commit -m "remove file2.dat"
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
# simulate remote ref
mkdir -p .git/refs/remotes/origin
git rev-parse HEAD > .git/refs/remotes/origin/HEAD
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
setup_alternate_remote "$reponame-$suffix"
test/test-push: set locksverify to true to fix tests
2017-02-16 20:10:05 +00:00
git config "lfs.$(repo_endpoint "$GITSERVER" "$reponame-$suffix").locksverify" true
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
}
begin_test "push --all (no ref args)"
(
set -e
push_all_setup "everything"
git lfs push --dry-run --all origin 2>&1 | tee push.log
grep "push $oid1 => file1.dat" push.log
grep "push $oid2 => file1.dat" push.log
grep "push $oid3 => file1.dat" push.log
grep "push $oid4 => file1.dat" push.log
grep "push $oid5 => file1.dat" push.log
grep "push $extraoid => file2.dat" push.log
t: tighten regular expression in push test In this test, we look for certain lines beginning with "push" by grepping through the log for lines which contain the word "push". While that works now, in the future, the credential helper will start to prattle to standard error. In doing so, it will print the name of the repo, which includes the word "push". To avoid test failures, tighten up the regexp to match only at the beginning of the line and only when there's a space following "push".
2018-09-18 20:38:19 +00:00
[ $(grep -c "^push " < push.log) -eq 6 ]
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
git push --all origin 2>&1 | tee push.log
t: ignore exact byte counts when pushing One of the test objects we use in this test refers to the current branch name and as a consequence, if we change the branch name, the number of bytes pushed will change. We don't really care about exactly how many bytes were pushed, only that we pushed the right number of objects, so shorten the string we look for to ignore the byte count. That we upload the right number of bytes is tested elsewhere anyway. We could also match the entire string for a variable number of bytes pushed, but this wouldn't be any more precise and would require the use the -E flag to grep and escaping of the parentheses.
2020-06-16 19:20:54 +00:00
[ $(grep -c "Uploading LFS objects: 100% (6/6)" push.log) -eq 1 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
assert_server_object "$reponame-$suffix" "$oid1"
assert_server_object "$reponame-$suffix" "$oid2"
assert_server_object "$reponame-$suffix" "$oid3"
assert_server_object "$reponame-$suffix" "$oid4"
assert_server_object "$reponame-$suffix" "$oid5"
assert_server_object "$reponame-$suffix" "$extraoid"
echo "push while missing old objects locally"
setup_alternate_remote "$reponame-$suffix-2"
test/test-push: set locksverify to true to fix tests
2017-02-16 20:10:05 +00:00
git config "lfs.$(repo_endpoint "$GITSERVER" "$reponame-$suffix-2").locksverify" true
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
git lfs push --object-id origin $oid1
assert_server_object "$reponame-$suffix-2" "$oid1"
refute_server_object "$reponame-$suffix-2" "$oid2"
refute_server_object "$reponame-$suffix-2" "$oid3"
refute_server_object "$reponame-$suffix-2" "$oid4"
refute_server_object "$reponame-$suffix-2" "$oid5"
refute_server_object "$reponame-$suffix-2" "$extraoid"
rm ".git/lfs/objects/${oid1:0:2}/${oid1:2:2}/$oid1"
introduce an uploadContext struct to share in push and pre-push
2016-04-06 19:06:34 +00:00
echo "dry run missing local object that exists on server"
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
git lfs push --dry-run --all origin 2>&1 | tee push.log
grep "push $oid1 => file1.dat" push.log
grep "push $oid2 => file1.dat" push.log
grep "push $oid3 => file1.dat" push.log
grep "push $oid4 => file1.dat" push.log
grep "push $oid5 => file1.dat" push.log
grep "push $extraoid => file2.dat" push.log
t: tighten regular expression in push test In this test, we look for certain lines beginning with "push" by grepping through the log for lines which contain the word "push". While that works now, in the future, the credential helper will start to prattle to standard error. In doing so, it will print the name of the repo, which includes the word "push". To avoid test failures, tighten up the regexp to match only at the beginning of the line and only when there's a space following "push".
2018-09-18 20:38:19 +00:00
[ $(grep -c "^push " push.log) -eq 6 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
git push --all origin 2>&1 | tee push.log
t: ignore exact byte counts when pushing One of the test objects we use in this test refers to the current branch name and as a consequence, if we change the branch name, the number of bytes pushed will change. We don't really care about exactly how many bytes were pushed, only that we pushed the right number of objects, so shorten the string we look for to ignore the byte count. That we upload the right number of bytes is tested elsewhere anyway. We could also match the entire string for a variable number of bytes pushed, but this wouldn't be any more precise and would require the use the -E flag to grep and escaping of the parentheses.
2020-06-16 19:20:54 +00:00
grep "Uploading LFS objects: 100% (6/6)" push.log
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
assert_server_object "$reponame-$suffix-2" "$oid2"
assert_server_object "$reponame-$suffix-2" "$oid3"
assert_server_object "$reponame-$suffix-2" "$oid4"
assert_server_object "$reponame-$suffix-2" "$oid5"
assert_server_object "$reponame-$suffix-2" "$extraoid"
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
)
end_test
begin_test "push --all (1 ref arg)"
(
set -e
push_all_setup "ref"
git lfs push --dry-run --all origin branch 2>&1 | tee push.log
grep "push $oid1 => file1.dat" push.log
grep "push $oid2 => file1.dat" push.log
grep "push $oid3 => file1.dat" push.log
t: tighten regular expression in push test In this test, we look for certain lines beginning with "push" by grepping through the log for lines which contain the word "push". While that works now, in the future, the credential helper will start to prattle to standard error. In doing so, it will print the name of the repo, which includes the word "push". To avoid test failures, tighten up the regexp to match only at the beginning of the line and only when there's a space following "push".
2018-09-18 20:38:19 +00:00
[ $(grep -c "^push " < push.log) -eq 3 ]
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
git lfs push --all origin branch 2>&1 | tee push.log
t/t-push.sh: do not short-circuit --all tests Since commit df2007d81c7e5487c448e8d967707e5548bb10e3 in PR #646 it appears that the push_all_setup() helper function has accidentally short-circuited all but the first test calling it by exiting early with an exit code of 0 when the test repo exists. The calling tests thus appear to pass but are instead skipping all of their actual test logic. The original intent appears to have been to reuse a single test repo for the set of related tests of the --all push option. However, these tests do not leave the repo state in the same condition created by push_all_setup(), e.g., they replace the "origin" remote, and most importantly they each remove an LFS object file. Thus simply replacing "exit 0" with "return 0" in push_all_setup() is insufficient. To simplify matters, we no longer try to reuse the test repos between tests. Rather, we let push_all_setup() create a unique test repo for each caller by appending the distinct suffix argument provided by the caller to the name of the test repo. We then have to account for the fact that these tests have not fully run in some time, and therefore missed changes like commit db4e3b271d08da8110be0ee0ee091a2f9f212fbc in PR #2811 which updated the Git LFS progress meter output format. Several calls to "git push" also need adjustment to avoid errors such as "--all can't be combined with refspecs" and "tag shorthand without <tag>", and one short-circuited test had an incorrect count of "push ... => file1.dat" lines which we revise.
2020-11-17 06:31:44 +00:00
[ $(grep -c "Uploading LFS objects: 100% (3/3)" push.log) -eq 1 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
assert_server_object "$reponame-$suffix" "$oid1"
assert_server_object "$reponame-$suffix" "$oid2"
assert_server_object "$reponame-$suffix" "$oid3"
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
refute_server_object "$reponame-$suffix" "$oid4" # in main and the tag
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
refute_server_object "$reponame-$suffix" "$oid5"
refute_server_object "$reponame-$suffix" "$extraoid"
echo "push while missing old objects locally"
setup_alternate_remote "$reponame-$suffix-2"
test/test-push: set locksverify to true to fix tests
2017-02-16 20:10:05 +00:00
git config "lfs.$(repo_endpoint "$GITSERVER" "$reponame-$suffix-2").locksverify" true
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
git lfs push --object-id origin $oid1
assert_server_object "$reponame-$suffix-2" "$oid1"
refute_server_object "$reponame-$suffix-2" "$oid2"
refute_server_object "$reponame-$suffix-2" "$oid3"
refute_server_object "$reponame-$suffix-2" "$oid4"
refute_server_object "$reponame-$suffix-2" "$oid5"
refute_server_object "$reponame-$suffix-2" "$extraoid"
rm ".git/lfs/objects/${oid1:0:2}/${oid1:2:2}/$oid1"
# dry run doesn't change
git lfs push --dry-run --all origin branch 2>&1 | tee push.log
grep "push $oid1 => file1.dat" push.log
grep "push $oid2 => file1.dat" push.log
grep "push $oid3 => file1.dat" push.log
t: tighten regular expression in push test In this test, we look for certain lines beginning with "push" by grepping through the log for lines which contain the word "push". While that works now, in the future, the credential helper will start to prattle to standard error. In doing so, it will print the name of the repo, which includes the word "push". To avoid test failures, tighten up the regexp to match only at the beginning of the line and only when there's a space following "push".
2018-09-18 20:38:19 +00:00
[ $(grep -c "^push " push.log) -eq 3 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
t/t-push.sh: do not short-circuit --all tests Since commit df2007d81c7e5487c448e8d967707e5548bb10e3 in PR #646 it appears that the push_all_setup() helper function has accidentally short-circuited all but the first test calling it by exiting early with an exit code of 0 when the test repo exists. The calling tests thus appear to pass but are instead skipping all of their actual test logic. The original intent appears to have been to reuse a single test repo for the set of related tests of the --all push option. However, these tests do not leave the repo state in the same condition created by push_all_setup(), e.g., they replace the "origin" remote, and most importantly they each remove an LFS object file. Thus simply replacing "exit 0" with "return 0" in push_all_setup() is insufficient. To simplify matters, we no longer try to reuse the test repos between tests. Rather, we let push_all_setup() create a unique test repo for each caller by appending the distinct suffix argument provided by the caller to the name of the test repo. We then have to account for the fact that these tests have not fully run in some time, and therefore missed changes like commit db4e3b271d08da8110be0ee0ee091a2f9f212fbc in PR #2811 which updated the Git LFS progress meter output format. Several calls to "git push" also need adjustment to avoid errors such as "--all can't be combined with refspecs" and "tag shorthand without <tag>", and one short-circuited test had an incorrect count of "push ... => file1.dat" lines which we revise.
2020-11-17 06:31:44 +00:00
git push origin branch 2>&1 | tee push.log
[ $(grep -c "Uploading LFS objects: 100% (3/3)" push.log) -eq 1 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
assert_server_object "$reponame-$suffix-2" "$oid2"
assert_server_object "$reponame-$suffix-2" "$oid3"
refute_server_object "$reponame-$suffix-2" "$oid4"
refute_server_object "$reponame-$suffix-2" "$oid5"
refute_server_object "$reponame-$suffix-2" "$extraoid"
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
)
end_test
begin_test "push --all (multiple ref args)"
(
set -e
push_all_setup "multiple-refs"
git lfs push --dry-run --all origin branch tag 2>&1 | tee push.log
grep "push $oid1 => file1.dat" push.log
grep "push $oid2 => file1.dat" push.log
grep "push $oid3 => file1.dat" push.log
grep "push $oid4 => file1.dat" push.log
t: tighten regular expression in push test In this test, we look for certain lines beginning with "push" by grepping through the log for lines which contain the word "push". While that works now, in the future, the credential helper will start to prattle to standard error. In doing so, it will print the name of the repo, which includes the word "push". To avoid test failures, tighten up the regexp to match only at the beginning of the line and only when there's a space following "push".
2018-09-18 20:38:19 +00:00
[ $(grep -c "^push " push.log) -eq 4 ]
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
git lfs push --all origin branch tag 2>&1 | tee push.log
t/t-push.sh: do not short-circuit --all tests Since commit df2007d81c7e5487c448e8d967707e5548bb10e3 in PR #646 it appears that the push_all_setup() helper function has accidentally short-circuited all but the first test calling it by exiting early with an exit code of 0 when the test repo exists. The calling tests thus appear to pass but are instead skipping all of their actual test logic. The original intent appears to have been to reuse a single test repo for the set of related tests of the --all push option. However, these tests do not leave the repo state in the same condition created by push_all_setup(), e.g., they replace the "origin" remote, and most importantly they each remove an LFS object file. Thus simply replacing "exit 0" with "return 0" in push_all_setup() is insufficient. To simplify matters, we no longer try to reuse the test repos between tests. Rather, we let push_all_setup() create a unique test repo for each caller by appending the distinct suffix argument provided by the caller to the name of the test repo. We then have to account for the fact that these tests have not fully run in some time, and therefore missed changes like commit db4e3b271d08da8110be0ee0ee091a2f9f212fbc in PR #2811 which updated the Git LFS progress meter output format. Several calls to "git push" also need adjustment to avoid errors such as "--all can't be combined with refspecs" and "tag shorthand without <tag>", and one short-circuited test had an incorrect count of "push ... => file1.dat" lines which we revise.
2020-11-17 06:31:44 +00:00
[ $(grep -c "Uploading LFS objects: 100% (4/4)" push.log) -eq 1 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
assert_server_object "$reponame-$suffix" "$oid1"
assert_server_object "$reponame-$suffix" "$oid2"
assert_server_object "$reponame-$suffix" "$oid3"
assert_server_object "$reponame-$suffix" "$oid4"
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
refute_server_object "$reponame-$suffix" "$oid5" # only in main
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
refute_server_object "$reponame-$suffix" "$extraoid"
echo "push while missing old objects locally"
setup_alternate_remote "$reponame-$suffix-2"
test/test-push: set locksverify to true to fix tests
2017-02-16 20:10:05 +00:00
git config "lfs.$(repo_endpoint "$GITSERVER" "$reponame-$suffix-2").locksverify" true
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
git lfs push --object-id origin $oid1
assert_server_object "$reponame-$suffix-2" "$oid1"
refute_server_object "$reponame-$suffix-2" "$oid2"
refute_server_object "$reponame-$suffix-2" "$oid3"
refute_server_object "$reponame-$suffix-2" "$oid4"
refute_server_object "$reponame-$suffix-2" "$oid5"
refute_server_object "$reponame-$suffix-2" "$extraoid"
rm ".git/lfs/objects/${oid1:0:2}/${oid1:2:2}/$oid1"
# dry run doesn't change
git lfs push --dry-run --all origin branch tag 2>&1 | tee push.log
grep "push $oid1 => file1.dat" push.log
grep "push $oid2 => file1.dat" push.log
grep "push $oid3 => file1.dat" push.log
grep "push $oid4 => file1.dat" push.log
t/t-push.sh: do not short-circuit --all tests Since commit df2007d81c7e5487c448e8d967707e5548bb10e3 in PR #646 it appears that the push_all_setup() helper function has accidentally short-circuited all but the first test calling it by exiting early with an exit code of 0 when the test repo exists. The calling tests thus appear to pass but are instead skipping all of their actual test logic. The original intent appears to have been to reuse a single test repo for the set of related tests of the --all push option. However, these tests do not leave the repo state in the same condition created by push_all_setup(), e.g., they replace the "origin" remote, and most importantly they each remove an LFS object file. Thus simply replacing "exit 0" with "return 0" in push_all_setup() is insufficient. To simplify matters, we no longer try to reuse the test repos between tests. Rather, we let push_all_setup() create a unique test repo for each caller by appending the distinct suffix argument provided by the caller to the name of the test repo. We then have to account for the fact that these tests have not fully run in some time, and therefore missed changes like commit db4e3b271d08da8110be0ee0ee091a2f9f212fbc in PR #2811 which updated the Git LFS progress meter output format. Several calls to "git push" also need adjustment to avoid errors such as "--all can't be combined with refspecs" and "tag shorthand without <tag>", and one short-circuited test had an incorrect count of "push ... => file1.dat" lines which we revise.
2020-11-17 06:31:44 +00:00
[ $(grep -c "^push " push.log) -eq 4 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
t/t-push.sh: do not short-circuit --all tests Since commit df2007d81c7e5487c448e8d967707e5548bb10e3 in PR #646 it appears that the push_all_setup() helper function has accidentally short-circuited all but the first test calling it by exiting early with an exit code of 0 when the test repo exists. The calling tests thus appear to pass but are instead skipping all of their actual test logic. The original intent appears to have been to reuse a single test repo for the set of related tests of the --all push option. However, these tests do not leave the repo state in the same condition created by push_all_setup(), e.g., they replace the "origin" remote, and most importantly they each remove an LFS object file. Thus simply replacing "exit 0" with "return 0" in push_all_setup() is insufficient. To simplify matters, we no longer try to reuse the test repos between tests. Rather, we let push_all_setup() create a unique test repo for each caller by appending the distinct suffix argument provided by the caller to the name of the test repo. We then have to account for the fact that these tests have not fully run in some time, and therefore missed changes like commit db4e3b271d08da8110be0ee0ee091a2f9f212fbc in PR #2811 which updated the Git LFS progress meter output format. Several calls to "git push" also need adjustment to avoid errors such as "--all can't be combined with refspecs" and "tag shorthand without <tag>", and one short-circuited test had an incorrect count of "push ... => file1.dat" lines which we revise.
2020-11-17 06:31:44 +00:00
git push origin branch refs/tags/tag 2>&1 | tee push.log
[ $(grep -c "Uploading LFS objects: 100% (4/4)" push.log) -eq 1 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
assert_server_object "$reponame-$suffix-2" "$oid2"
assert_server_object "$reponame-$suffix-2" "$oid3"
assert_server_object "$reponame-$suffix-2" "$oid4"
refute_server_object "$reponame-$suffix-2" "$oid5"
refute_server_object "$reponame-$suffix-2" "$extraoid"
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
)
end_test
begin_test "push --all (ref with deleted files)"
(
set -e
push_all_setup "ref-with-deleted"
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push --dry-run --all origin main 2>&1 | tee push.log
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
grep "push $oid1 => file1.dat" push.log
grep "push $oid2 => file1.dat" push.log
grep "push $oid4 => file1.dat" push.log
grep "push $oid5 => file1.dat" push.log
grep "push $extraoid => file2.dat" push.log
t: tighten regular expression in push test In this test, we look for certain lines beginning with "push" by grepping through the log for lines which contain the word "push". While that works now, in the future, the credential helper will start to prattle to standard error. In doing so, it will print the name of the repo, which includes the word "push". To avoid test failures, tighten up the regexp to match only at the beginning of the line and only when there's a space following "push".
2018-09-18 20:38:19 +00:00
[ $(grep -c "^push " push.log) -eq 5 ]
rework 'push --all' so it's consistent with fetch
2015-09-09 20:18:51 +00:00
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push --all origin main 2>&1 | tee push.log
t/t-push.sh: do not short-circuit --all tests Since commit df2007d81c7e5487c448e8d967707e5548bb10e3 in PR #646 it appears that the push_all_setup() helper function has accidentally short-circuited all but the first test calling it by exiting early with an exit code of 0 when the test repo exists. The calling tests thus appear to pass but are instead skipping all of their actual test logic. The original intent appears to have been to reuse a single test repo for the set of related tests of the --all push option. However, these tests do not leave the repo state in the same condition created by push_all_setup(), e.g., they replace the "origin" remote, and most importantly they each remove an LFS object file. Thus simply replacing "exit 0" with "return 0" in push_all_setup() is insufficient. To simplify matters, we no longer try to reuse the test repos between tests. Rather, we let push_all_setup() create a unique test repo for each caller by appending the distinct suffix argument provided by the caller to the name of the test repo. We then have to account for the fact that these tests have not fully run in some time, and therefore missed changes like commit db4e3b271d08da8110be0ee0ee091a2f9f212fbc in PR #2811 which updated the Git LFS progress meter output format. Several calls to "git push" also need adjustment to avoid errors such as "--all can't be combined with refspecs" and "tag shorthand without <tag>", and one short-circuited test had an incorrect count of "push ... => file1.dat" lines which we revise.
2020-11-17 06:31:44 +00:00
[ $(grep -c "Uploading LFS objects: 100% (5/5)" push.log) -eq 1 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
assert_server_object "$reponame-$suffix" "$oid1"
assert_server_object "$reponame-$suffix" "$oid2"
refute_server_object "$reponame-$suffix" "$oid3" # only in the branch
assert_server_object "$reponame-$suffix" "$oid4"
assert_server_object "$reponame-$suffix" "$oid5"
assert_server_object "$reponame-$suffix" "$extraoid"
echo "push while missing old objects locally"
setup_alternate_remote "$reponame-$suffix-2"
test/test-push: set locksverify to true to fix tests
2017-02-16 20:10:05 +00:00
git config "lfs.$(repo_endpoint "$GITSERVER" "$reponame-$suffix-2").locksverify" true
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
git lfs push --object-id origin $oid1
assert_server_object "$reponame-$suffix-2" "$oid1"
refute_server_object "$reponame-$suffix-2" "$oid2"
refute_server_object "$reponame-$suffix-2" "$oid3"
refute_server_object "$reponame-$suffix-2" "$oid4"
refute_server_object "$reponame-$suffix-2" "$oid5"
refute_server_object "$reponame-$suffix-2" "$extraoid"
rm ".git/lfs/objects/${oid1:0:2}/${oid1:2:2}/$oid1"
# dry run doesn't change
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push --dry-run --all origin main 2>&1 | tee push.log
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
grep "push $oid1 => file1.dat" push.log
grep "push $oid2 => file1.dat" push.log
grep "push $oid4 => file1.dat" push.log
grep "push $oid5 => file1.dat" push.log
grep "push $extraoid => file2.dat" push.log
t: tighten regular expression in push test In this test, we look for certain lines beginning with "push" by grepping through the log for lines which contain the word "push". While that works now, in the future, the credential helper will start to prattle to standard error. In doing so, it will print the name of the repo, which includes the word "push". To avoid test failures, tighten up the regexp to match only at the beginning of the line and only when there's a space following "push".
2018-09-18 20:38:19 +00:00
[ $(grep -c "^push " push.log) -eq 5 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
t/t-push.sh: do not short-circuit --all tests Since commit df2007d81c7e5487c448e8d967707e5548bb10e3 in PR #646 it appears that the push_all_setup() helper function has accidentally short-circuited all but the first test calling it by exiting early with an exit code of 0 when the test repo exists. The calling tests thus appear to pass but are instead skipping all of their actual test logic. The original intent appears to have been to reuse a single test repo for the set of related tests of the --all push option. However, these tests do not leave the repo state in the same condition created by push_all_setup(), e.g., they replace the "origin" remote, and most importantly they each remove an LFS object file. Thus simply replacing "exit 0" with "return 0" in push_all_setup() is insufficient. To simplify matters, we no longer try to reuse the test repos between tests. Rather, we let push_all_setup() create a unique test repo for each caller by appending the distinct suffix argument provided by the caller to the name of the test repo. We then have to account for the fact that these tests have not fully run in some time, and therefore missed changes like commit db4e3b271d08da8110be0ee0ee091a2f9f212fbc in PR #2811 which updated the Git LFS progress meter output format. Several calls to "git push" also need adjustment to avoid errors such as "--all can't be combined with refspecs" and "tag shorthand without <tag>", and one short-circuited test had an incorrect count of "push ... => file1.dat" lines which we revise.
2020-11-17 06:31:44 +00:00
git push origin main 2>&1 | tee push.log
[ $(grep -c "Uploading LFS objects: 100% (5/5)" push.log) -eq 1 ]
teach 'push --all' to skip objects not in .git/lfs/objects but already on the server
2015-09-09 20:58:58 +00:00
assert_server_object "$reponame-$suffix-2" "$oid2"
refute_server_object "$reponame-$suffix-2" "$oid3"
assert_server_object "$reponame-$suffix-2" "$oid4"
assert_server_object "$reponame-$suffix-2" "$oid5"
assert_server_object "$reponame-$suffix-2" "$extraoid"
port push tests
2015-05-26 21:09:24 +00:00
)
end_test
Add option to push object ID(s) directly.
2015-06-28 15:13:44 +00:00
begin_test "push object id(s)"
(
set -e
reponame="$(basename "$0" ".sh")"
setup_remote_repo "$reponame"
clone_repo "$reponame" repo2
test/test-push: set locksverify to true to fix tests
2017-02-16 20:10:05 +00:00
git config "lfs.$(repo_endpoint "$GITSERVER" "$reponame").locksverify" true
Add option to push object ID(s) directly.
2015-06-28 15:13:44 +00:00
git lfs track "*.dat"
echo "push a" > a.dat
git add .gitattributes a.dat
git commit -m "add a.dat"
Rename command line parameter "objectid" to "object-id". https://github.com/github/git-lfs/pull/449/files#r33897536
2015-07-06 09:34:49 +00:00
git lfs push --object-id origin \
Add option to push object ID(s) directly.
2015-06-28 15:13:44 +00:00
4c48d2a6991c9895bcddcf027e1e4907280bcf21975492b1afbade396d6a3340 \
2>&1 | tee push.log
tq: new progress meter formatting
2018-01-06 02:01:50 +00:00
grep "Uploading LFS objects: 100% (1/1), 7 B" push.log
Add option to push object ID(s) directly.
2015-06-28 15:13:44 +00:00
echo "push b" > b.dat
git add b.dat
git commit -m "add b.dat"
Rename command line parameter "objectid" to "object-id". https://github.com/github/git-lfs/pull/449/files#r33897536
2015-07-06 09:34:49 +00:00
git lfs push --object-id origin \
Add option to push object ID(s) directly.
2015-06-28 15:13:44 +00:00
4c48d2a6991c9895bcddcf027e1e4907280bcf21975492b1afbade396d6a3340 \
82be50ad35070a4ef3467a0a650c52d5b637035e7ad02c36652e59d01ba282b7 \
2>&1 | tee push.log
tq: new progress meter formatting
2018-01-06 02:01:50 +00:00
grep "Uploading LFS objects: 100% (2/2), 14 B" push.log
Add option to push object ID(s) directly.
2015-06-28 15:13:44 +00:00
)
end_test
Add enhanced test setup tools for 'go test' and integration tests * Use test.Repo and AddCommits to set up complex multi-branch tests * Can commit in the past for history tests, branch, merge and tag * Can generate random data for files or use what you give it * Returns full detail of the commits created including SHAs and OIDs * Can pipe JSON from a batch file into lfstest-testutils to get the same functionality in acceptance tests * get_date bash util to create commit dates easily on BSD/Mac and GNU * see test-push.sh for bash example and scanner_git_test.go for go test
2015-08-25 16:39:33 +00:00
begin_test "push modified files"
(
set -e
reponame="$(basename "$0" ".sh")-modified"
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
git lfs track "*.dat"
# generate content we'll use
content1="filecontent1"
content2="filecontent2"
content3="filecontent3"
Fix failure to push non-current branch #606 Use of CurrentRef as 'left' doesn't work when pushing any other branch. Instead use specified ref vs remote state.
2015-08-26 10:29:57 +00:00
content4="filecontent4"
content5="filecontent5"
introduce calc_oid() helper for integration tests
2015-09-21 17:50:22 +00:00
oid1=$(calc_oid "$content1")
oid2=$(calc_oid "$content2")
oid3=$(calc_oid "$content3")
oid4=$(calc_oid "$content4")
oid5=$(calc_oid "$content5")
default to the batch API if lfs.batch is not set
2015-09-01 20:31:51 +00:00
Add enhanced test setup tools for 'go test' and integration tests * Use test.Repo and AddCommits to set up complex multi-branch tests * Can commit in the past for history tests, branch, merge and tag * Can generate random data for files or use what you give it * Returns full detail of the commits created including SHAs and OIDs * Can pipe JSON from a batch file into lfstest-testutils to get the same functionality in acceptance tests * get_date bash util to create commit dates easily on BSD/Mac and GNU * see test-push.sh for bash example and scanner_git_test.go for go test
2015-08-25 16:39:33 +00:00
echo "[
{
\"CommitDate\":\"$(get_date -6m)\",
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content1}, \"Data\":\"$content1\"}]
},
{
\"CommitDate\":\"$(get_date -3m)\",
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content2}, \"Data\":\"$content2\"}]
},
{
\"CommitDate\":\"$(get_date -1m)\",
Fix failure to push non-current branch #606 Use of CurrentRef as 'left' doesn't work when pushing any other branch. Instead use specified ref vs remote state.
2015-08-26 10:29:57 +00:00
\"NewBranch\":\"other_branch\",
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content5}, \"Data\":\"$content5\"}]
},
{
\"CommitDate\":\"$(get_date -1m)\",
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
\"ParentBranches\":[\"main\"],
Add enhanced test setup tools for 'go test' and integration tests * Use test.Repo and AddCommits to set up complex multi-branch tests * Can commit in the past for history tests, branch, merge and tag * Can generate random data for files or use what you give it * Returns full detail of the commits created including SHAs and OIDs * Can pipe JSON from a batch file into lfstest-testutils to get the same functionality in acceptance tests * get_date bash util to create commit dates easily on BSD/Mac and GNU * see test-push.sh for bash example and scanner_git_test.go for go test
2015-08-25 16:39:33 +00:00
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content3}, \"Data\":\"$content3\"},
{\"Filename\":\"file2.dat\",\"Size\":${#content4}, \"Data\":\"$content4\"}]
}
]" | lfstest-testutils addcommits
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push origin main
Fix failure to push non-current branch #606 Use of CurrentRef as 'left' doesn't work when pushing any other branch. Instead use specified ref vs remote state.
2015-08-26 10:29:57 +00:00
git lfs push origin other_branch
Add enhanced test setup tools for 'go test' and integration tests * Use test.Repo and AddCommits to set up complex multi-branch tests * Can commit in the past for history tests, branch, merge and tag * Can generate random data for files or use what you give it * Returns full detail of the commits created including SHAs and OIDs * Can pipe JSON from a batch file into lfstest-testutils to get the same functionality in acceptance tests * get_date bash util to create commit dates easily on BSD/Mac and GNU * see test-push.sh for bash example and scanner_git_test.go for go test
2015-08-25 16:39:33 +00:00
assert_server_object "$reponame" "$oid1"
assert_server_object "$reponame" "$oid2"
assert_server_object "$reponame" "$oid3"
assert_server_object "$reponame" "$oid4"
Fix failure to push non-current branch #606 Use of CurrentRef as 'left' doesn't work when pushing any other branch. Instead use specified ref vs remote state.
2015-08-26 10:29:57 +00:00
assert_server_object "$reponame" "$oid5"
Add enhanced test setup tools for 'go test' and integration tests * Use test.Repo and AddCommits to set up complex multi-branch tests * Can commit in the past for history tests, branch, merge and tag * Can generate random data for files or use what you give it * Returns full detail of the commits created including SHAs and OIDs * Can pipe JSON from a batch file into lfstest-testutils to get the same functionality in acceptance tests * get_date bash util to create commit dates easily on BSD/Mac and GNU * see test-push.sh for bash example and scanner_git_test.go for go test
2015-08-25 16:39:33 +00:00
)
end_test
guard against invalid remotes passed to `git lfs push`
2016-02-03 20:06:05 +00:00
begin_test "push with invalid remote"
(
set -e
cd repo
git lfs push not-a-remote 2>&1 | tee push.log
grep "Invalid remote name" push.log
)
end_test
Catch specific case of ambiguous refs in revListShas
2016-03-31 15:38:55 +00:00
begin_test "push ambiguous branch name"
(
set -e
reponame="$(basename "$0" ".sh")-ambiguous-branch"
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
git lfs track "*.dat" 2>&1 | tee track.log
commands/track: quote pattern in output of track command
2017-03-24 16:59:03 +00:00
grep "Tracking \"\*.dat\"" track.log
Catch specific case of ambiguous refs in revListShas
2016-03-31 15:38:55 +00:00
NUMFILES=5
# generate content we'll use
for ((a=0; a < NUMFILES ; a++))
do
content[$a]="filecontent$a"
oid[$a]=$(calc_oid "${content[$a]}")
done
echo "[
{
\"CommitDate\":\"$(get_date -10d)\",
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content[0]}, \"Data\":\"${content[0]}\"},
{\"Filename\":\"file2.dat\",\"Size\":${#content[1]}, \"Data\":\"${content[1]}\"}]
},
{
\"NewBranch\":\"ambiguous\",
\"CommitDate\":\"$(get_date -5d)\",
\"Files\":[
{\"Filename\":\"file3.dat\",\"Size\":${#content[2]}, \"Data\":\"${content[2]}\"}]
},
{
\"CommitDate\":\"$(get_date -2d)\",
\"Files\":[
{\"Filename\":\"file4.dat\",\"Size\":${#content[3]}, \"Data\":\"${content[3]}\"}]
},
{
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
\"ParentBranches\":[\"main\"],
Catch specific case of ambiguous refs in revListShas
2016-03-31 15:38:55 +00:00
\"CommitDate\":\"$(get_date -1d)\",
\"Files\":[
{\"Filename\":\"file1.dat\",\"Size\":${#content[4]}, \"Data\":\"${content[4]}\"}]
}
]" | lfstest-testutils addcommits
# create tag with same name as branch
git tag ambiguous
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
# lfs push main, should work
git lfs push origin main
Catch specific case of ambiguous refs in revListShas
2016-03-31 15:38:55 +00:00
commands: extract lockVerifier from uploadContext
2017-11-01 23:35:43 +00:00
# push ambiguous, does not fail since lfs scans git with sha, not ref name
Catch specific case of ambiguous refs in revListShas
2016-03-31 15:38:55 +00:00
git lfs push origin ambiguous
)
end_test
test/push: test retrying expired objects
2016-07-05 17:24:46 +00:00
begin_test "push (retry with expired actions)"
(
set -e
reponame="push_retry_expired_action"
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
git lfs track "*.dat"
tq,test: trace retry error for failed API requests
2017-04-26 17:23:29 +00:00
contents="return-expired-action"
contents_oid="$(calc_oid "$contents")"
t: avoid using shell variables in printf's first argument The printf(1) command, like it's C cousin, takes a format string as its first argument. If a shell variable is passed as the first argument, it will be interpreted as a format string; this can lead to surprising behavior and can cause the test suite to fail if we accidentally insert a format string character into the variable. Modify all the places in the individual tests that we use a plain quoted variable as the format string by running the following Ruby one-liner: ruby -i -pe '$_.gsub!(/printf "\$/, %q(printf "%s" "$))' t/t-*.sh Avoid modifying the test helpers, as there are places (such as calc_oid) where we want to pass text containing escapes (such as "\n") and have those be properly interpreted by printf(1).
2018-09-10 14:57:10 +00:00
contents_size="$(printf "%s" "$contents" | wc -c | awk '{ print $1 }')"
printf "%s" "$contents" > a.dat
test/push: test retrying expired objects
2016-07-05 17:24:46 +00:00
git add .gitattributes a.dat
git commit -m "add a.dat, .gitattributes" 2>&1 | tee commit.log
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
grep "main (root-commit)" commit.log
test/push: test retrying expired objects
2016-07-05 17:24:46 +00:00
grep "2 files changed" commit.log
grep "create mode 100644 a.dat" commit.log
grep "create mode 100644 .gitattributes" commit.log
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
GIT_TRACE=1 git push origin main 2>&1 | tee push.log
test/push: test retrying expired objects
2016-07-05 17:24:46 +00:00
tq: add exponential backoff for retries Previously, retries happened as fast as possible unless the server provided the Retry-After header. This is effective for certain types of errors, but not when the LFS server is experiencing a temporary but not instantaneous failure. Delaying between retries lets the server recover and the LFS operation complete. Delays start at a fixed 250ms for the first retry and double with each successive retry up to a configurable maximum delay, 10s by default. The maximum retry is configurable using lfs.transfer.maxretrydelay. Delays can be disabled by setting the max delay to 0.
2020-04-15 03:13:27 +00:00
expected="enqueue retry #1 after 0.25s for \"$contents_oid\" (size: $contents_size): LFS: tq: action \"upload\" expires at"
tq,test: trace retry error for failed API requests
2017-04-26 17:23:29 +00:00
grep "$expected" push.log
tq: new progress meter formatting
2018-01-06 02:01:50 +00:00
grep "Uploading LFS objects: 100% (1/1), 21 B" push.log
test/push: test retrying expired objects
2016-07-05 17:24:46 +00:00
)
end_test
transfer: error on invalid object size from batch response
2016-07-13 18:58:55 +00:00
add happy path tests for push/pull/fetch
2016-08-15 21:11:05 +00:00
begin_test "push to raw remote url"
(
set -e
setup_remote_repo "push-raw"
mkdir push-raw
cd push-raw
git init
git lfs track "*.dat"
contents="raw"
contents_oid=$(calc_oid "$contents")
t: avoid using shell variables in printf's first argument The printf(1) command, like it's C cousin, takes a format string as its first argument. If a shell variable is passed as the first argument, it will be interpreted as a format string; this can lead to surprising behavior and can cause the test suite to fail if we accidentally insert a format string character into the variable. Modify all the places in the individual tests that we use a plain quoted variable as the format string by running the following Ruby one-liner: ruby -i -pe '$_.gsub!(/printf "\$/, %q(printf "%s" "$))' t/t-*.sh Avoid modifying the test helpers, as there are places (such as calc_oid) where we want to pass text containing escapes (such as "\n") and have those be properly interpreted by printf(1).
2018-09-10 14:57:10 +00:00
printf "%s" "$contents" > raw.dat
add happy path tests for push/pull/fetch
2016-08-15 21:11:05 +00:00
git add raw.dat .gitattributes
git commit -m "add" 2>&1 | tee commit.log
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
grep "main (root-commit)" commit.log
add happy path tests for push/pull/fetch
2016-08-15 21:11:05 +00:00
grep "2 files changed" commit.log
grep "create mode 100644 raw.dat" commit.log
grep "create mode 100644 .gitattributes" commit.log
refute_server_object push-raw "$contents_oid"
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push $GITSERVER/push-raw main
add happy path tests for push/pull/fetch
2016-08-15 21:11:05 +00:00
assert_server_object push-raw "$contents_oid"
)
end_test
transfer: error on invalid object size from batch response
2016-07-13 18:58:55 +00:00
begin_test "push (with invalid object size)"
(
set -e
reponame="push-invalid-object-size"
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
git lfs track "*.dat"
contents="return-invalid-size"
t: avoid using shell variables in printf's first argument The printf(1) command, like it's C cousin, takes a format string as its first argument. If a shell variable is passed as the first argument, it will be interpreted as a format string; this can lead to surprising behavior and can cause the test suite to fail if we accidentally insert a format string character into the variable. Modify all the places in the individual tests that we use a plain quoted variable as the format string by running the following Ruby one-liner: ruby -i -pe '$_.gsub!(/printf "\$/, %q(printf "%s" "$))' t/t-*.sh Avoid modifying the test helpers, as there are places (such as calc_oid) where we want to pass text containing escapes (such as "\n") and have those be properly interpreted by printf(1).
2018-09-10 14:57:10 +00:00
printf "%s" "$contents" > a.dat
transfer: error on invalid object size from batch response
2016-07-13 18:58:55 +00:00
git add a.dat .gitattributes
git commit -m "add a.dat, .gitattributes" 2>&1 | tee commit.log
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
grep "main (root-commit)" commit.log
transfer: error on invalid object size from batch response
2016-07-13 18:58:55 +00:00
grep "2 files changed" commit.log
grep "create mode 100644 a.dat" commit.log
grep "create mode 100644 .gitattributes" commit.log
set +e
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git push origin main 2>&1 2> push.log
transfer: error on invalid object size from batch response
2016-07-13 18:58:55 +00:00
res="$?"
set -e
grep "invalid size (got: -1)" push.log
tq: prevent uint64 underflow with invalid API response
2018-03-07 00:35:50 +00:00
[ "0" -eq "$(grep -c "panic" push.log)" ]
transfer: error on invalid object size from batch response
2016-07-13 18:58:55 +00:00
[ "0" -ne "$res" ]
refute_server_object "$reponame" "$(calc_oid "$contents")"
)
end_test
test/test-push: ensure _links property is used
2017-03-06 20:12:09 +00:00
begin_test "push with deprecated _links"
(
set -e
reponame="$(basename "$0" ".sh")-deprecated"
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
git lfs track "*.dat"
git add .gitattributes
git commit -m "initial commit"
contents="send-deprecated-links"
contents_oid="$(calc_oid "$contents")"
t: avoid using shell variables in printf's first argument The printf(1) command, like it's C cousin, takes a format string as its first argument. If a shell variable is passed as the first argument, it will be interpreted as a format string; this can lead to surprising behavior and can cause the test suite to fail if we accidentally insert a format string character into the variable. Modify all the places in the individual tests that we use a plain quoted variable as the format string by running the following Ruby one-liner: ruby -i -pe '$_.gsub!(/printf "\$/, %q(printf "%s" "$))' t/t-*.sh Avoid modifying the test helpers, as there are places (such as calc_oid) where we want to pass text containing escapes (such as "\n") and have those be properly interpreted by printf(1).
2018-09-10 14:57:10 +00:00
printf "%s" "$contents" > a.dat
test/test-push: ensure _links property is used
2017-03-06 20:12:09 +00:00
git add a.dat
git commit -m "add a.dat"
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git push origin main
test/test-push: ensure _links property is used
2017-03-06 20:12:09 +00:00
assert_server_object "$reponame" "$contents_oid"
)
turn lfs.allowincompletepush on by default
2017-09-12 14:33:52 +00:00
end_test
tq/adapterbase: support rewriting href Use insteadOf/pushInsteadOf aliases to rewrite href to upload/download LFS objects. This is useful in situations such like you need to access the LFS server via a reverse proxy.
2019-04-02 08:48:21 +00:00
begin_test "push with invalid pushInsteadof"
(
set -e
push_repo_setup "push-invalid-pushinsteadof"
# set pushInsteadOf to rewrite the href of uploading LFS object.
git config url."$GITSERVER/storage/invalid".pushInsteadOf "$GITSERVER/storage/"
tq/adapterbase: add lfs.transfer.enablehrefrewrite config For backward compatibility and some incompatible situations such as using SSH protocol, href-rewriting is only enabled if lfs.transfer.enablehrefrewrite is set to true explicitly.
2019-04-03 04:01:37 +00:00
# Enable href rewriting explicitly.
git config lfs.transfer.enablehrefrewrite true
tq/adapterbase: support rewriting href Use insteadOf/pushInsteadOf aliases to rewrite href to upload/download LFS objects. This is useful in situations such like you need to access the LFS server via a reverse proxy.
2019-04-02 08:48:21 +00:00
set +e
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push origin main > push.log 2>&1
tq/adapterbase: support rewriting href Use insteadOf/pushInsteadOf aliases to rewrite href to upload/download LFS objects. This is useful in situations such like you need to access the LFS server via a reverse proxy.
2019-04-02 08:48:21 +00:00
res=$?
set -e
[ "$res" = "2" ]
# check rewritten href is used to upload LFS object.
grep "LFS: Authorization error: $GITSERVER/storage/invalid" push.log
tq/adapterbase: add lfs.transfer.enablehrefrewrite config For backward compatibility and some incompatible situations such as using SSH protocol, href-rewriting is only enabled if lfs.transfer.enablehrefrewrite is set to true explicitly.
2019-04-03 04:01:37 +00:00
tq/adapterbase: fix typo enableHrefRerite to enableHrefRewrite
2019-04-04 02:04:00 +00:00
# lfs-push succeed after unsetting enableHrefRewrite config
tq/adapterbase: add lfs.transfer.enablehrefrewrite config For backward compatibility and some incompatible situations such as using SSH protocol, href-rewriting is only enabled if lfs.transfer.enablehrefrewrite is set to true explicitly.
2019-04-03 04:01:37 +00:00
git config --unset lfs.transfer.enablehrefrewrite
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push origin main
tq/adapterbase: support rewriting href Use insteadOf/pushInsteadOf aliases to rewrite href to upload/download LFS objects. This is useful in situations such like you need to access the LFS server via a reverse proxy.
2019-04-02 08:48:21 +00:00
)
end_test
Don't fail if we lack objects the server has A Git LFS client may not have the entire history of the objects for the repository. However, in some situations, we traverse the entire history of a branch when pushing it, meaning that we need to process every LFS object in the history of that branch. If the objects for the entire history are not present, we currently fail to push. Instead, let's mark objects we don't have on disk as missing and only fail when we would need to upload those objects. We'll know the server has the objects if the batch response provides no actions to take for them when we request an upload. Pass the missing flag down through the code, and always set it to false for non-uploads. If for some reason we fail to properly flag a missing object, we will still fail later on when we cannot open the file, just in a messier and more poorly controlled way. The technique used here will attempt to abort the batch as soon as we notice a problem, which means that in the common case (less than 100 objects) we won't have transferred any objects, so the user can notice the failure as soon as possible. Update the tests to look for a string which will occur in the error message, since we no longer produce the system error message for ENOENT.
2019-04-30 19:18:18 +00:00
begin_test 'push with data the server already has'
(
set -e
reponame="push-server-data"
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
git lfs track "*.dat"
git add .gitattributes
git commit -m "initial commit"
contents="abc123"
contents_oid="$(calc_oid "$contents")"
printf "%s" "$contents" > a.dat
git add a.dat
git commit -m "add a.dat"
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git push origin main
Don't fail if we lack objects the server has A Git LFS client may not have the entire history of the objects for the repository. However, in some situations, we traverse the entire history of a branch when pushing it, meaning that we need to process every LFS object in the history of that branch. If the objects for the entire history are not present, we currently fail to push. Instead, let's mark objects we don't have on disk as missing and only fail when we would need to upload those objects. We'll know the server has the objects if the batch response provides no actions to take for them when we request an upload. Pass the missing flag down through the code, and always set it to false for non-uploads. If for some reason we fail to properly flag a missing object, we will still fail later on when we cannot open the file, just in a messier and more poorly controlled way. The technique used here will attempt to abort the batch as soon as we notice a problem, which means that in the common case (less than 100 objects) we won't have transferred any objects, so the user can notice the failure as soon as possible. Update the tests to look for a string which will occur in the error message, since we no longer produce the system error message for ENOENT.
2019-04-30 19:18:18 +00:00
assert_server_object "$reponame" "$contents_oid"
git checkout -b side
# Use a different file name for the second file; otherwise, this test
# unexpectedly passes with the old code, since we fail to notice that the
# object we run through the clean filter is not the object we wanted.
contents2="def456"
contents2_oid="$(calc_oid "$contents2")"
printf "%s" "$contents2" > b.dat
git add b.dat
git commit -m "add b.dat"
# We remove the original object. The server already has this.
delete_local_object "$contents_oid"
# We use the URL so that we cannot take advantage of the existing "origin/*"
# refs that we know the server must have. We will traverse the entire history
# for this push, and we should not fail because the server already has the
# object we deleted above.
git push "$(git config remote.origin.url)" side
assert_server_object "$reponame" "$contents2_oid"
)
end_test
Test pushing custom local reference This adds a test case that makes sure that git lfs push supports pushing local references in nonstandard namespaces, that is, outside of refs/heads, refs/tags, and refs/remotes.
2019-10-30 00:59:27 +00:00
Optimize pushes of multiple refs When pushing multiple refs, we know any Git objects on the remote side can be excluded from the objects that refer to LFS objects we need to push, since if the remote side already has the Git objects, it should have the corresponding LFS objects as well. However, when traversing Git objects, we traverse them on a per-ref basis, which is required since any LFS objects which spawn a batch request will need the ref to be placed in the batch request as part of the protocol. Let's find a list of all the remote sides that exist before traversing any Git objects, and exclude traversing any of those objects in any traversal. As a result, we can traverse far, far fewer objects, especially when pushing new refs in a large repository. Note that we exclude the case when the left and right sides are the same because our code sets them to the same thing in some cases even though Git does not, so we cannot reason about the values in that case.
2020-01-14 19:43:35 +00:00
begin_test 'push with multiple refs and data the server already has'
(
set -e
reponame="push-multi-ref-server-data"
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
git lfs track "*.dat"
git add .gitattributes
git commit -m "initial commit"
contents="abc123"
contents_oid="$(calc_oid "$contents")"
printf "%s" "$contents" > a.dat
git add a.dat
git commit -m "add a.dat"
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git push origin main
Optimize pushes of multiple refs When pushing multiple refs, we know any Git objects on the remote side can be excluded from the objects that refer to LFS objects we need to push, since if the remote side already has the Git objects, it should have the corresponding LFS objects as well. However, when traversing Git objects, we traverse them on a per-ref basis, which is required since any LFS objects which spawn a batch request will need the ref to be placed in the batch request as part of the protocol. Let's find a list of all the remote sides that exist before traversing any Git objects, and exclude traversing any of those objects in any traversal. As a result, we can traverse far, far fewer objects, especially when pushing new refs in a large repository. Note that we exclude the case when the left and right sides are the same because our code sets them to the same thing in some cases even though Git does not, so we cannot reason about the values in that case.
2020-01-14 19:43:35 +00:00
assert_server_object "$reponame" "$contents_oid"
contents2="def456"
contents2_oid="$(calc_oid "$contents2")"
printf "%s" "$contents2" > b.dat
git add b.dat
git commit -m "add b.dat"
# Create a tag. Normally this would cause the entire history to be traversed
# since it's a new ref, but we no longer do that since we're pushing multiple
# refs.
git tag -m v1.0.0 -a v1.0.0
# We remove the original object. The server already has this.
delete_local_object "$contents_oid"
# We use the URL so that we cannot take advantage of the existing "origin/*"
# refs that we know the server must have.
GIT_TRACE=1 GIT_TRANSFER_TRACE=1 GIT_CURL_VERBOSE=1 \
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git push "$(git config remote.origin.url)" main v1.0.0 2>&1 | tee push.log
Optimize pushes of multiple refs When pushing multiple refs, we know any Git objects on the remote side can be excluded from the objects that refer to LFS objects we need to push, since if the remote side already has the Git objects, it should have the corresponding LFS objects as well. However, when traversing Git objects, we traverse them on a per-ref basis, which is required since any LFS objects which spawn a batch request will need the ref to be placed in the batch request as part of the protocol. Let's find a list of all the remote sides that exist before traversing any Git objects, and exclude traversing any of those objects in any traversal. As a result, we can traverse far, far fewer objects, especially when pushing new refs in a large repository. Note that we exclude the case when the left and right sides are the same because our code sets them to the same thing in some cases even though Git does not, so we cannot reason about the values in that case.
2020-01-14 19:43:35 +00:00
# We should not find a batch request for the object which is in the earlier
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
# version of main, since we know the remote side has it.
Optimize pushes of multiple refs When pushing multiple refs, we know any Git objects on the remote side can be excluded from the objects that refer to LFS objects we need to push, since if the remote side already has the Git objects, it should have the corresponding LFS objects as well. However, when traversing Git objects, we traverse them on a per-ref basis, which is required since any LFS objects which spawn a batch request will need the ref to be placed in the batch request as part of the protocol. Let's find a list of all the remote sides that exist before traversing any Git objects, and exclude traversing any of those objects in any traversal. As a result, we can traverse far, far fewer objects, especially when pushing new refs in a large repository. Note that we exclude the case when the left and right sides are the same because our code sets them to the same thing in some cases even though Git does not, so we cannot reason about the values in that case.
2020-01-14 19:43:35 +00:00
[ "$(grep -c "$contents_oid" push.log)" = 0 ]
# Yet we should have pushed the new object successfully.
assert_server_object "$reponame" "$contents2_oid"
)
end_test
Test pushing custom local reference This adds a test case that makes sure that git lfs push supports pushing local references in nonstandard namespaces, that is, outside of refs/heads, refs/tags, and refs/remotes.
2019-10-30 00:59:27 +00:00
begin_test "push custom reference"
(
set -e
reponame="push-custom-reference"
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
git lfs track "*.dat"
# generate content we'll use
content="filecontent"
oid=$(calc_oid "$content")
echo "[
{
\"CommitDate\":\"$(get_date -6m)\",
\"Files\":[
{\"Filename\":\"file.dat\",\"Size\":${#content}, \"Data\":\"$content\"}]
}
]" | lfstest-testutils addcommits
# Create and try pushing a reference in a nonstandard namespace, that is,
# outside of refs/heads, refs/tags, and refs/remotes.
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git update-ref refs/custom/remote/heads/main refs/heads/main
Test pushing custom local reference This adds a test case that makes sure that git lfs push supports pushing local references in nonstandard namespaces, that is, outside of refs/heads, refs/tags, and refs/remotes.
2019-10-30 00:59:27 +00:00
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t | xargs sed -i -e 's/master/main/g'
2020-06-29 16:18:57 +00:00
git lfs push origin refs/custom/remote/heads/main
Test pushing custom local reference This adds a test case that makes sure that git lfs push supports pushing local references in nonstandard namespaces, that is, outside of refs/heads, refs/tags, and refs/remotes.
2019-10-30 00:59:27 +00:00
assert_server_object "$reponame" "$oid"
)
end_test
fs: don't panic when using a too-short object ID to push Previously, we'd panic when trying to slice into the object ID if the user provided a too-short object ID on the command line. Instead, let's fix this so we reject too-short object IDs with an error.
2020-11-16 15:30:18 +00:00
begin_test "push --object-id (invalid value)"
(
set -e
t/t-push.sh: revise test of truncated object ID We adjust the test of invalid object ID handling in "git lfs push" added in commit 3f4662b489a1bb84fda605472d4e662fc6abb0c9 so that it passes again now that its logic is fully executed, as it was previously short-circuited by the bug in push_all_setup() (described in commit f9381fa37cb25af17c6d90f4eea054770cb5692d) and with that bug fixed, the test actually fails. The test intends to check for an error message from "git lfs push" when passed an OID shorter than 4 characters, so we revise it to generate a 3-character OID; that then allows the test to pass. We also adjust the name passed to push_all_setup() to avoid conflicting with the "everything" test of the --all option.
2020-11-17 06:31:08 +00:00
push_all_setup "push-invalid-oid"
fs: don't panic when using a too-short object ID to push Previously, we'd panic when trying to slice into the object ID if the user provided a too-short object ID on the command line. Instead, let's fix this so we reject too-short object IDs with an error.
2020-11-16 15:30:18 +00:00
git lfs push --object-id origin '' 2>&1 | tee push.log
t/t-push.sh: revise test of truncated object ID We adjust the test of invalid object ID handling in "git lfs push" added in commit 3f4662b489a1bb84fda605472d4e662fc6abb0c9 so that it passes again now that its logic is fully executed, as it was previously short-circuited by the bug in push_all_setup() (described in commit f9381fa37cb25af17c6d90f4eea054770cb5692d) and with that bug fixed, the test actually fails. The test intends to check for an error message from "git lfs push" when passed an OID shorter than 4 characters, so we revise it to generate a 3-character OID; that then allows the test to pass. We also adjust the name passed to push_all_setup() to avoid conflicting with the "everything" test of the --all option.
2020-11-17 06:31:08 +00:00
git lfs push --object-id origin "${oid1:0:3}" 2>&1 | tee -a push.log
fs: don't panic when using a too-short object ID to push Previously, we'd panic when trying to slice into the object ID if the user provided a too-short object ID on the command line. Instead, let's fix this so we reject too-short object IDs with an error.
2020-11-16 15:30:18 +00:00
[ "$(grep -c 'too short object ID' push.log)" -eq 2 ]
)
end_test
t: add test for download gzip transport compression Since we're uploading and downloading a large amount of data, we may prefer to use transport compression. Currently, Go will do this for us automatically unless we ask it not to. Let's detect this case and add a trace output so people can find it and we can add a test that it continues to work. Note that it's not possible to detect this using the headers since Go adds the headers on the request and strips the headers on the response as part of making the request, so it's not readily apparent to users without this trace output.
2020-12-10 20:42:36 +00:00
begin_test "storage upload with compression"
(
set -e
reponame="storage-compress"
setup_remote_repo "$reponame"
clone_repo "$reponame" storage-compress
contents="storage-compress"
oid="$(calc_oid "$contents")"
printf "%s" "$contents" > a.dat
git lfs track "*.dat"
git add .gitattributes a.dat
git commit -m "initial commit"
GIT_CURL_VERBOSE=1 git push origin main | tee push.log
assert_server_object "$reponame" "$oid"
pushd ..
git \
-c "filter.lfs.process=" \
-c "filter.lfs.smudge=cat" \
-c "filter.lfs.required=false" \
clone "$GITSERVER/$reponame" "$reponame-assert"
cd "$reponame-assert"
git config credential.helper lfstest
GIT_TRACE=1 git lfs pull origin main 2>&1 | tee pull.log
if [ "0" -ne "${PIPESTATUS[0]}" ]; then
echo >&2 "fatal: expected \`git lfs pull origin main\` to succeed ..."
exit 1
fi
grep "decompressed gzipped response" pull.log
assert_local_object "$oid" "${#contents}"
popd
)
end_test
Reference in New Issue Copy Permalink