Merge pull request #3109 from git-lfs/ls/check-push
change lfs.allowincompletepush default from true to false
This commit is contained in:
Taylor Blau
GitHub
commit
5e601f8aa0
@ -100,7 +100,7 @@ func newUploadContext(dryRun bool) *uploadContext {
|
||||
uploadedOids: tools.NewStringSet(),
|
||||
gitfilter: lfs.NewGitFilter(cfg),
|
||||
lockVerifier: newLockVerifier(manifest),
|
||||
allowMissing: cfg.Git.Bool("lfs.allowincompletepush", true),
|
||||
allowMissing: cfg.Git.Bool("lfs.allowincompletepush", false),
|
||||
missing: make(map[string]string),
|
||||
corrupt: make(map[string]string),
|
||||
otherErrs: make([]error, 0),
|
||||
@ -289,6 +289,11 @@ func (c *uploadContext) ReportErrors() {
|
||||
}
|
||||
|
||||
if !c.allowMissing {
|
||||
pushMissingHint := []string{
|
||||
"hint: Your push was rejected due to missing or corrupt local objects.",
|
||||
"hint: You can disable this check with: 'git config lfs.allowincompletepush true'",
|
||||
}
|
||||
Print(strings.Join(pushMissingHint, "\n"))
|
||||
os.Exit(2)
|
||||
}
|
||||
}
|
||||
|
||||
@ -156,7 +156,7 @@ be scoped inside the configuration for a remote.
|
||||
* `lfs.allowincompletepush`
|
||||
|
||||
When pushing, allow objects to be missing from the local cache without halting
|
||||
a Git push. Default: true.
|
||||
a Git push. Default: false.
|
||||
|
||||
### Fetch settings
|
||||
|
||||
|
||||
@ -320,7 +320,7 @@ begin_test "pre-push with missing pointer which is on server"
|
||||
)
|
||||
end_test
|
||||
|
||||
begin_test "pre-push with missing and present pointers"
|
||||
begin_test "pre-push with missing and present pointers (lfs.allowincompletepush true)"
|
||||
(
|
||||
set -e
|
||||
|
||||
@ -352,6 +352,8 @@ begin_test "pre-push with missing and present pointers"
|
||||
missing_oid_path=".git/lfs/objects/$missing_oid_part_1/$missing_oid_part_2/$missing_oid"
|
||||
rm "$missing_oid_path"
|
||||
|
||||
git config lfs.allowincompletepush true
|
||||
|
||||
echo "refs/heads/master master refs/heads/master 0000000000000000000000000000000000000000" |
|
||||
git lfs pre-push origin "$GITSERVER/$reponame" 2>&1 |
|
||||
tee push.log
|
||||
@ -369,7 +371,7 @@ begin_test "pre-push with missing and present pointers"
|
||||
)
|
||||
end_test
|
||||
|
||||
begin_test "pre-push allowincompletepush=f reject missing pointers"
|
||||
begin_test "pre-push reject missing pointers (lfs.allowincompletepush default)"
|
||||
(
|
||||
set -e
|
||||
|
||||
@ -401,8 +403,6 @@ begin_test "pre-push allowincompletepush=f reject missing pointers"
|
||||
missing_oid_path=".git/lfs/objects/$missing_oid_part_1/$missing_oid_part_2/$missing_oid"
|
||||
rm "$missing_oid_path"
|
||||
|
||||
git config "lfs.allowincompletepush" "false"
|
||||
|
||||
echo "refs/heads/master master refs/heads/master 0000000000000000000000000000000000000000" |
|
||||
git lfs pre-push origin "$GITSERVER/$reponame" 2>&1 |
|
||||
tee push.log
|
||||
|
||||
198
test/test-push-failures-local.sh
Executable file
198
test/test-push-failures-local.sh
Executable file
@ -0,0 +1,198 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
. "test/testlib.sh"
|
||||
|
||||
begin_test "push with missing objects (lfs.allowincompletepush true)"
|
||||
(
|
||||
set -e
|
||||
|
||||
reponame="push-with-missing-objects"
|
||||
setup_remote_repo "$reponame"
|
||||
clone_repo "$reponame" "$reponame"
|
||||
|
||||
git lfs track "*.dat"
|
||||
git add .gitattributes
|
||||
git commit -m "initial commit"
|
||||
|
||||
present="present"
|
||||
present_oid="$(calc_oid "$present")"
|
||||
printf "$present" > present.dat
|
||||
|
||||
missing="missing"
|
||||
missing_oid="$(calc_oid "$missing")"
|
||||
printf "$missing" > missing.dat
|
||||
|
||||
git add missing.dat present.dat
|
||||
git commit -m "add objects"
|
||||
|
||||
git rm missing.dat
|
||||
git commit -m "remove missing"
|
||||
|
||||
# :fire: the "missing" object
|
||||
missing_oid_part_1="$(echo "$missing_oid" | cut -b 1-2)"
|
||||
missing_oid_part_2="$(echo "$missing_oid" | cut -b 3-4)"
|
||||
missing_oid_path=".git/lfs/objects/$missing_oid_part_1/$missing_oid_part_2/$missing_oid"
|
||||
rm "$missing_oid_path"
|
||||
|
||||
git config lfs.allowincompletepush true
|
||||
|
||||
git push origin master 2>&1 | tee push.log
|
||||
if [ "0" -ne "${PIPESTATUS[0]}" ]; then
|
||||
echo >&2 "fatal: expected \`git push origin master\` to succeed ..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
grep "LFS upload missing objects" push.log
|
||||
grep " (missing) missing.dat ($missing_oid)" push.log
|
||||
|
||||
assert_server_object "$reponame" "$present_oid"
|
||||
refute_server_object "$reponame" "$missing_oid"
|
||||
)
|
||||
end_test
|
||||
|
||||
begin_test "push reject missing objects (lfs.allowincompletepush false)"
|
||||
(
|
||||
set -e
|
||||
|
||||
reponame="push-reject-missing-objects"
|
||||
setup_remote_repo "$reponame"
|
||||
clone_repo "$reponame" "$reponame"
|
||||
|
||||
git lfs track "*.dat"
|
||||
git add .gitattributes
|
||||
git commit -m "initial commit"
|
||||
|
||||
present="present"
|
||||
present_oid="$(calc_oid "$present")"
|
||||
printf "$present" > present.dat
|
||||
|
||||
missing="missing"
|
||||
missing_oid="$(calc_oid "$missing")"
|
||||
printf "$missing" > missing.dat
|
||||
|
||||
git add missing.dat present.dat
|
||||
git commit -m "add objects"
|
||||
|
||||
git rm missing.dat
|
||||
git commit -m "remove missing"
|
||||
|
||||
# :fire: the "missing" object
|
||||
missing_oid_part_1="$(echo "$missing_oid" | cut -b 1-2)"
|
||||
missing_oid_part_2="$(echo "$missing_oid" | cut -b 3-4)"
|
||||
missing_oid_path=".git/lfs/objects/$missing_oid_part_1/$missing_oid_part_2/$missing_oid"
|
||||
rm "$missing_oid_path"
|
||||
|
||||
git config lfs.allowincompletepush false
|
||||
|
||||
git push origin master 2>&1 | tee push.log
|
||||
if [ "1" -ne "${PIPESTATUS[0]}" ]; then
|
||||
echo >&2 "fatal: expected \`git push origin master\` to succeed ..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
grep "no such file or directory" push.log || # unix
|
||||
grep "cannot find the file" push.log # windows
|
||||
grep "failed to push some refs" push.log
|
||||
|
||||
refute_server_object "$reponame" "$present_oid"
|
||||
refute_server_object "$reponame" "$missing_oid"
|
||||
)
|
||||
end_test
|
||||
|
||||
begin_test "push reject missing objects (lfs.allowincompletepush default)"
|
||||
(
|
||||
set -e
|
||||
|
||||
reponame="push-missing-objects"
|
||||
setup_remote_repo "$reponame"
|
||||
clone_repo "$reponame" "$reponame"
|
||||
|
||||
git lfs track "*.dat"
|
||||
git add .gitattributes
|
||||
git commit -m "initial commit"
|
||||
|
||||
missing="missing"
|
||||
missing_oid="$(calc_oid "$missing")"
|
||||
missing_len="$(printf "$missing" | wc -c | awk '{ print $1 }')"
|
||||
printf "$missing" > missing.dat
|
||||
git add missing.dat
|
||||
git commit -m "add missing.dat"
|
||||
|
||||
present="present"
|
||||
present_oid="$(calc_oid "$present")"
|
||||
present_len="$(printf "$present" | wc -c | awk '{ print $1 }')"
|
||||
printf "$present" > present.dat
|
||||
git add present.dat
|
||||
git commit -m "add present.dat"
|
||||
|
||||
assert_local_object "$missing_oid" "$missing_len"
|
||||
assert_local_object "$present_oid" "$present_len"
|
||||
|
||||
delete_local_object "$missing_oid"
|
||||
|
||||
refute_local_object "$missing_oid"
|
||||
assert_local_object "$present_oid" "$present_len"
|
||||
|
||||
git push origin master 2>&1 | tee push.log
|
||||
|
||||
if [ "0" -eq "${PIPESTATUS[0]}" ]; then
|
||||
echo >&2 "fatal: expected 'git push origin master' to exit with non-zero code"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
grep "LFS upload failed:" push.log
|
||||
grep " (missing) missing.dat ($missing_oid)" push.log
|
||||
|
||||
refute_server_object "$reponame" "$missing_oid"
|
||||
assert_server_object "$reponame" "$present_oid"
|
||||
)
|
||||
end_test
|
||||
|
||||
begin_test "push reject corrupt objects (lfs.allowincompletepush default)"
|
||||
(
|
||||
set -e
|
||||
|
||||
reponame="push-corrupt-objects"
|
||||
setup_remote_repo "$reponame"
|
||||
clone_repo "$reponame" "$reponame"
|
||||
|
||||
git lfs track "*.dat"
|
||||
git add .gitattributes
|
||||
git commit -m "initial commit"
|
||||
|
||||
corrupt="corrupt"
|
||||
corrupt_oid="$(calc_oid "$corrupt")"
|
||||
corrupt_len="$(printf "$corrupt" | wc -c | awk '{ print $1 }')"
|
||||
printf "$corrupt" > corrupt.dat
|
||||
git add corrupt.dat
|
||||
git commit -m "add corrupt.dat"
|
||||
|
||||
present="present"
|
||||
present_oid="$(calc_oid "$present")"
|
||||
present_len="$(printf "$present" | wc -c | awk '{ print $1 }')"
|
||||
printf "$present" > present.dat
|
||||
git add present.dat
|
||||
git commit -m "add present.dat"
|
||||
|
||||
assert_local_object "$corrupt_oid" "$corrupt_len"
|
||||
assert_local_object "$present_oid" "$present_len"
|
||||
|
||||
corrupt_local_object "$corrupt_oid"
|
||||
|
||||
refute_local_object "$corrupt_oid" "$corrupt_len"
|
||||
assert_local_object "$present_oid" "$present_len"
|
||||
|
||||
git push origin master 2>&1 | tee push.log
|
||||
|
||||
if [ "0" -eq "${PIPESTATUS[0]}" ]; then
|
||||
echo >&2 "fatal: expected 'git push origin master' to exit with non-zero code"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
grep "LFS upload failed:" push.log
|
||||
grep " (corrupt) corrupt.dat ($corrupt_oid)" push.log
|
||||
|
||||
refute_server_object "$reponame" "$corrupt_oid"
|
||||
assert_server_object "$reponame" "$present_oid"
|
||||
)
|
||||
end_test
|
||||
@ -1,66 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
. "test/testlib.sh"
|
||||
|
||||
begin_test "push missing objects"
|
||||
(
|
||||
set -e
|
||||
|
||||
reponame="push-missing-objects"
|
||||
setup_remote_repo "$reponame"
|
||||
clone_repo "$reponame" "$reponame"
|
||||
|
||||
git lfs track "*.dat"
|
||||
git add .gitattributes
|
||||
git commit -m "initial commit"
|
||||
|
||||
missing="missing"
|
||||
missing_oid="$(calc_oid "$missing")"
|
||||
missing_len="$(printf "$missing" | wc -c | awk '{ print $1 }')"
|
||||
printf "$missing" > missing.dat
|
||||
git add missing.dat
|
||||
git commit -m "add missing.dat"
|
||||
|
||||
corrupt="corrupt"
|
||||
corrupt_oid="$(calc_oid "$corrupt")"
|
||||
corrupt_len="$(printf "$corrupt" | wc -c | awk '{ print $1 }')"
|
||||
printf "$corrupt" > corrupt.dat
|
||||
git add corrupt.dat
|
||||
git commit -m "add corrupt.dat"
|
||||
|
||||
present="present"
|
||||
present_oid="$(calc_oid "$present")"
|
||||
present_len="$(printf "$present" | wc -c | awk '{ print $1 }')"
|
||||
printf "$present" > present.dat
|
||||
git add present.dat
|
||||
git commit -m "add present.dat"
|
||||
|
||||
assert_local_object "$missing_oid" "$missing_len"
|
||||
assert_local_object "$corrupt_oid" "$corrupt_len"
|
||||
assert_local_object "$present_oid" "$present_len"
|
||||
|
||||
delete_local_object "$missing_oid"
|
||||
corrupt_local_object "$corrupt_oid"
|
||||
|
||||
refute_local_object "$missing_oid"
|
||||
refute_local_object "$corrupt_oid" "$corrupt_len"
|
||||
assert_local_object "$present_oid" "$present_len"
|
||||
|
||||
git config lfs.allowincompletepush false
|
||||
|
||||
git push origin master 2>&1 | tee push.log
|
||||
|
||||
if [ "0" -eq "${PIPESTATUS[0]}" ]; then
|
||||
echo >&2 "fatal: expected 'git push origin master' to exit with non-zero code"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
grep "LFS upload failed:" push.log
|
||||
grep " (missing) missing.dat ($missing_oid)" push.log
|
||||
grep " (corrupt) corrupt.dat ($corrupt_oid)" push.log
|
||||
|
||||
refute_server_object "$reponame" "$missing_oid"
|
||||
refute_server_object "$reponame" "$corrupt_oid"
|
||||
assert_server_object "$reponame" "$present_oid"
|
||||
)
|
||||
end_test
|
||||
@ -661,98 +661,4 @@ begin_test "push with deprecated _links"
|
||||
|
||||
assert_server_object "$reponame" "$contents_oid"
|
||||
)
|
||||
|
||||
begin_test "push with missing objects (lfs.allowincompletepush=t)"
|
||||
(
|
||||
set -e
|
||||
|
||||
reponame="push-with-missing-objects"
|
||||
setup_remote_repo "$reponame"
|
||||
clone_repo "$reponame" "$reponame"
|
||||
|
||||
git lfs track "*.dat"
|
||||
git add .gitattributes
|
||||
git commit -m "initial commit"
|
||||
|
||||
present="present"
|
||||
present_oid="$(calc_oid "$present")"
|
||||
printf "$present" > present.dat
|
||||
|
||||
missing="missing"
|
||||
missing_oid="$(calc_oid "$missing")"
|
||||
printf "$missing" > missing.dat
|
||||
|
||||
git add missing.dat present.dat
|
||||
git commit -m "add objects"
|
||||
|
||||
git rm missing.dat
|
||||
git commit -m "remove missing"
|
||||
|
||||
# :fire: the "missing" object
|
||||
missing_oid_part_1="$(echo "$missing_oid" | cut -b 1-2)"
|
||||
missing_oid_part_2="$(echo "$missing_oid" | cut -b 3-4)"
|
||||
missing_oid_path=".git/lfs/objects/$missing_oid_part_1/$missing_oid_part_2/$missing_oid"
|
||||
rm "$missing_oid_path"
|
||||
|
||||
git push origin master 2>&1 | tee push.log
|
||||
if [ "0" -ne "${PIPESTATUS[0]}" ]; then
|
||||
echo >&2 "fatal: expected \`git push origin master\` to succeed ..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
grep "LFS upload missing objects" push.log
|
||||
grep " (missing) missing.dat ($missing_oid)" push.log
|
||||
|
||||
assert_server_object "$reponame" "$present_oid"
|
||||
refute_server_object "$reponame" "$missing_oid"
|
||||
)
|
||||
end_test
|
||||
|
||||
begin_test "push reject missing objects (lfs.allowincompletepush=f)"
|
||||
(
|
||||
set -e
|
||||
|
||||
reponame="push-reject-missing-objects"
|
||||
setup_remote_repo "$reponame"
|
||||
clone_repo "$reponame" "$reponame"
|
||||
|
||||
git lfs track "*.dat"
|
||||
git add .gitattributes
|
||||
git commit -m "initial commit"
|
||||
|
||||
present="present"
|
||||
present_oid="$(calc_oid "$present")"
|
||||
printf "$present" > present.dat
|
||||
|
||||
missing="missing"
|
||||
missing_oid="$(calc_oid "$missing")"
|
||||
printf "$missing" > missing.dat
|
||||
|
||||
git add missing.dat present.dat
|
||||
git commit -m "add objects"
|
||||
|
||||
git rm missing.dat
|
||||
git commit -m "remove missing"
|
||||
|
||||
# :fire: the "missing" object
|
||||
missing_oid_part_1="$(echo "$missing_oid" | cut -b 1-2)"
|
||||
missing_oid_part_2="$(echo "$missing_oid" | cut -b 3-4)"
|
||||
missing_oid_path=".git/lfs/objects/$missing_oid_part_1/$missing_oid_part_2/$missing_oid"
|
||||
rm "$missing_oid_path"
|
||||
|
||||
git config "lfs.allowincompletepush" "false"
|
||||
|
||||
git push origin master 2>&1 | tee push.log
|
||||
if [ "1" -ne "${PIPESTATUS[0]}" ]; then
|
||||
echo >&2 "fatal: expected \`git push origin master\` to succeed ..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
grep "no such file or directory" push.log || # unix
|
||||
grep "cannot find the file" push.log # windows
|
||||
grep "failed to push some refs" push.log
|
||||
|
||||
refute_server_object "$reponame" "$present_oid"
|
||||
refute_server_object "$reponame" "$missing_oid"
|
||||
)
|
||||
end_test
|
||||
|
||||
Loading…
Reference in New Issue
Block a user