kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e2e: fix git submodules for file:// 

I guess upstream git intentionally broke this because of a CVE.

Also fix wait_for_sync to actually exit early when possible.
This commit is contained in:
Tim Hockin 2022-11-23 23:37:39 -08:00
parent 713d460bee
commit a492289ebf
No known key found for this signature in database
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test_e2e.sh
View File

@ -34,7 +34,7 @@ function wait_for_file_exists() {
local ticks=$(($2*10)) # 100ms per tick local ticks=$(($2*10)) # 100ms per tick
while [[ $ticks > 0 ]]; do while [[ $ticks > 0 ]]; do
if [[ -x "$file" ]]; then if [[ -f "$file" ]]; then
break break
fi fi
sleep 0.1 sleep 0.1
@ -1826,7 +1826,7 @@ function e2e::submodule_sync_default() {
git -C "$NESTED_SUBMODULE" commit -aqm "init nested-submodule file" git -C "$NESTED_SUBMODULE" commit -aqm "init nested-submodule file"
# Add submodule # Add submodule
git -C "$REPO" submodule add -q file://$SUBMODULE git -C "$REPO" -c protocol.file.allow=always submodule add -q file://$SUBMODULE
git -C "$REPO" commit -aqm "add submodule" git -C "$REPO" commit -aqm "add submodule"
GIT_SYNC \ GIT_SYNC \
@ -1845,7 +1845,7 @@ function e2e::submodule_sync_default() {
# Make change in submodule repo # Make change in submodule repo
echo "$FUNCNAME 2" > "$SUBMODULE"/submodule echo "$FUNCNAME 2" > "$SUBMODULE"/submodule
git -C "$SUBMODULE" commit -qam "$FUNCNAME 2" git -C "$SUBMODULE" commit -qam "$FUNCNAME 2"
git -C "$REPO" submodule update --recursive --remote > /dev/null 2>&1 git -C "$REPO" -c protocol.file.allow=always submodule update --recursive --remote > /dev/null 2>&1
git -C "$REPO" commit -qam "$FUNCNAME 2" git -C "$REPO" commit -qam "$FUNCNAME 2"
wait_for_sync 3 wait_for_sync 3
assert_link_exists "$ROOT"/link assert_link_exists "$ROOT"/link
@ -1855,7 +1855,7 @@ function e2e::submodule_sync_default() {
# Move backward in submodule repo # Move backward in submodule repo
git -C "$SUBMODULE" reset -q --hard HEAD^ git -C "$SUBMODULE" reset -q --hard HEAD^
git -C "$REPO" submodule update --recursive --remote > /dev/null 2>&1 git -C "$REPO" -c protocol.file.allow=always submodule update --recursive --remote > /dev/null 2>&1
git -C "$REPO" commit -qam "$FUNCNAME 3" git -C "$REPO" commit -qam "$FUNCNAME 3"
wait_for_sync 3 wait_for_sync 3
assert_link_exists "$ROOT"/link assert_link_exists "$ROOT"/link
@ -1864,9 +1864,9 @@ function e2e::submodule_sync_default() {
assert_file_eq "$ROOT"/link/$SUBMODULE_REPO_NAME/submodule "submodule" assert_file_eq "$ROOT"/link/$SUBMODULE_REPO_NAME/submodule "submodule"
# Add nested submodule to submodule repo # Add nested submodule to submodule repo
git -C "$SUBMODULE" submodule add -q file://$NESTED_SUBMODULE git -C "$SUBMODULE" -c protocol.file.allow=always submodule add -q file://$NESTED_SUBMODULE
git -C "$SUBMODULE" commit -aqm "add nested submodule" git -C "$SUBMODULE" commit -aqm "add nested submodule"
git -C "$REPO" submodule update --recursive --remote > /dev/null 2>&1 git -C "$REPO" -c protocol.file.allow=always submodule update --recursive --remote > /dev/null 2>&1
git -C "$REPO" commit -qam "$FUNCNAME 4" git -C "$REPO" commit -qam "$FUNCNAME 4"
wait_for_sync 3 wait_for_sync 3
assert_link_exists "$ROOT"/link assert_link_exists "$ROOT"/link
@ -1880,7 +1880,7 @@ function e2e::submodule_sync_default() {
rm -rf "$SUBMODULE"/.git/modules/$NESTED_SUBMODULE_REPO_NAME rm -rf "$SUBMODULE"/.git/modules/$NESTED_SUBMODULE_REPO_NAME
git -C "$SUBMODULE" rm -qf $NESTED_SUBMODULE_REPO_NAME git -C "$SUBMODULE" rm -qf $NESTED_SUBMODULE_REPO_NAME
git -C "$SUBMODULE" commit -aqm "delete nested submodule" git -C "$SUBMODULE" commit -aqm "delete nested submodule"
git -C "$REPO" submodule update --recursive --remote > /dev/null 2>&1 git -C "$REPO" -c protocol.file.allow=always submodule update --recursive --remote > /dev/null 2>&1
git -C "$REPO" commit -qam "$FUNCNAME 5" git -C "$REPO" commit -qam "$FUNCNAME 5"
wait_for_sync 3 wait_for_sync 3
assert_link_exists "$ROOT"/link assert_link_exists "$ROOT"/link
@ -1918,7 +1918,7 @@ function e2e::submodule_sync_depth() {
echo "$FUNCNAME 1" > "$SUBMODULE"/submodule echo "$FUNCNAME 1" > "$SUBMODULE"/submodule
git -C "$SUBMODULE" add submodule git -C "$SUBMODULE" add submodule
git -C "$SUBMODULE" commit -aqm "submodule $FUNCNAME 1" git -C "$SUBMODULE" commit -aqm "submodule $FUNCNAME 1"
git -C "$REPO" submodule add -q file://$SUBMODULE git -C "$REPO" -c protocol.file.allow=always submodule add -q file://$SUBMODULE
git -C "$REPO" config -f "$REPO"/.gitmodules submodule.$SUBMODULE_REPO_NAME.shallow true git -C "$REPO" config -f "$REPO"/.gitmodules submodule.$SUBMODULE_REPO_NAME.shallow true
git -C "$REPO" commit -qam "$FUNCNAME 1" git -C "$REPO" commit -qam "$FUNCNAME 1"
@ -1946,7 +1946,7 @@ function e2e::submodule_sync_depth() {
# Move forward # Move forward
echo "$FUNCNAME 2" > "$SUBMODULE"/submodule echo "$FUNCNAME 2" > "$SUBMODULE"/submodule
git -C "$SUBMODULE" commit -aqm "submodule $FUNCNAME 2" git -C "$SUBMODULE" commit -aqm "submodule $FUNCNAME 2"
git -C "$REPO" submodule update --recursive --remote > /dev/null 2>&1 git -C "$REPO" -c protocol.file.allow=always submodule update --recursive --remote > /dev/null 2>&1
git -C "$REPO" commit -qam "$FUNCNAME 2" git -C "$REPO" commit -qam "$FUNCNAME 2"
wait_for_sync 3 wait_for_sync 3
assert_link_exists "$ROOT"/link assert_link_exists "$ROOT"/link
@ -1963,7 +1963,7 @@ function e2e::submodule_sync_depth() {
# Move backward # Move backward
git -C "$SUBMODULE" reset -q --hard HEAD^ git -C "$SUBMODULE" reset -q --hard HEAD^
git -C "$REPO" submodule update --recursive --remote > /dev/null 2>&1 git -C "$REPO" -c protocol.file.allow=always submodule update --recursive --remote > /dev/null 2>&1
git -C "$REPO" commit -qam "$FUNCNAME 3" git -C "$REPO" commit -qam "$FUNCNAME 3"
wait_for_sync 3 wait_for_sync 3
assert_link_exists "$ROOT"/link assert_link_exists "$ROOT"/link
@ -1995,7 +1995,7 @@ function e2e::submodule_sync_off() {
git -C "$SUBMODULE" commit -aqm "init submodule file" git -C "$SUBMODULE" commit -aqm "init submodule file"
# Add submodule # Add submodule
git -C "$REPO" submodule add -q file://$SUBMODULE git -C "$REPO" -c protocol.file.allow=always submodule add -q file://$SUBMODULE
git -C "$REPO" commit -aqm "add submodule" git -C "$REPO" commit -aqm "add submodule"
GIT_SYNC \ GIT_SYNC \
@ -2034,11 +2034,11 @@ function e2e::submodule_sync_shallow() {
echo "nested-submodule" > "$NESTED_SUBMODULE"/nested-submodule echo "nested-submodule" > "$NESTED_SUBMODULE"/nested-submodule
git -C "$NESTED_SUBMODULE" add nested-submodule git -C "$NESTED_SUBMODULE" add nested-submodule
git -C "$NESTED_SUBMODULE" commit -aqm "init nested-submodule file" git -C "$NESTED_SUBMODULE" commit -aqm "init nested-submodule file"
git -C "$SUBMODULE" submodule add -q file://$NESTED_SUBMODULE git -C "$SUBMODULE" -c protocol.file.allow=always submodule add -q file://$NESTED_SUBMODULE
git -C "$SUBMODULE" commit -aqm "add nested submodule" git -C "$SUBMODULE" commit -aqm "add nested submodule"
# Add submodule # Add submodule
git -C "$REPO" submodule add -q file://$SUBMODULE git -C "$REPO" -c protocol.file.allow=always submodule add -q file://$SUBMODULE
git -C "$REPO" commit -aqm "add submodule" git -C "$REPO" commit -aqm "add submodule"
GIT_SYNC \ GIT_SYNC \