2017-06-23 18:41:55 +00:00
|
|
|
#!/usr/bin/env bash
|
|
|
|
|
|
2018-07-11 18:15:53 +00:00
|
|
|
. "$(dirname "$0")/fixtures/migrate.sh"
|
2018-07-10 18:48:02 +00:00
|
|
|
. "$(dirname "$0")/testlib.sh"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
begin_test "migrate import (default branch)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
|
|
|
|
md_oid="$(calc_oid "$(git cat-file -p :a.md)")"
|
|
|
|
|
txt_oid="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p my-feature:a.md)")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.md" "$md_oid" "140"
|
|
|
|
|
assert_pointer "refs/heads/main" "a.txt" "$txt_oid" "120"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
assert_local_object "$md_oid" "140"
|
|
|
|
|
assert_local_object "$txt_oid" "120"
|
|
|
|
|
refute_local_object "$md_feature_oid" "30"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
feature="$(git rev-parse refs/heads/my-feature)"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main_attrs="$(git cat-file -p "$main:.gitattributes")"
|
2017-06-23 21:53:41 +00:00
|
|
|
[ ! $(git cat-file -p "$feature:.gitattributes") ]
|
2017-06-23 18:41:55 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
echo "$main_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$main_attrs" | grep -q "*.txt filter=lfs diff=lfs merge=lfs"
|
commands/command_migrate_import.go: install hooks
When migrating a repository to use Git LFS for the first time, a user is
also required to run 'git lfs install' inside of their newly-migrated
repository, lest they are unable to push.
This is due to the fact that 'git lfs install' writes
.git/hooks/pre-push, which Git invokes, in turn invoking Git LFS to push
Git LFS objects to the remote before sending Git objects.
Without this, we will push only plain-text pointer files, which puts the
pusher at risk of loosing data, or failing any provider-specific
verification/integrity checks.
So, let's run installHooks() to place hooks in the right place, which
makes the following command sequence possible:
$ git lfs migrate import ...
$ git push --all
Let's avoid running this in 'git lfs migrate info' and 'git lfs migrate
export', since neither require it.
2018-09-05 14:49:23 +00:00
|
|
|
|
|
|
|
|
# Ensure that hooks are installed. If we find 'git-lfs' somewhere in
|
|
|
|
|
# .git/hooks/pre-push we assume that the rest went correctly, too.
|
|
|
|
|
grep -q "git-lfs" .git/hooks/pre-push
|
2017-06-23 18:41:55 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2017-12-05 02:53:08 +00:00
|
|
|
begin_test "migrate import (bare repository)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_remote_branches
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --everything
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2017-06-23 18:41:55 +00:00
|
|
|
begin_test "migrate import (given branch)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
|
|
|
|
md_oid="$(calc_oid "$(git cat-file -p :a.md)")"
|
|
|
|
|
txt_oid="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p my-feature:a.md)")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import my-feature
|
|
|
|
|
|
|
|
|
|
assert_pointer "refs/heads/my-feature" "a.md" "$md_feature_oid" "30"
|
|
|
|
|
assert_pointer "refs/heads/my-feature" "a.txt" "$txt_oid" "120"
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.md" "$md_oid" "140"
|
|
|
|
|
assert_pointer "refs/heads/main" "a.txt" "$txt_oid" "120"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
assert_local_object "$md_oid" "140"
|
|
|
|
|
assert_local_object "$md_feature_oid" "30"
|
|
|
|
|
assert_local_object "$txt_oid" "120"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
feature="$(git rev-parse refs/heads/my-feature)"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main_attrs="$(git cat-file -p "$main:.gitattributes")"
|
2017-06-23 21:53:41 +00:00
|
|
|
feature_attrs="$(git cat-file -p "$feature:.gitattributes")"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
echo "$main_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$main_attrs" | grep -q "*.txt filter=lfs diff=lfs merge=lfs"
|
2017-06-23 18:41:55 +00:00
|
|
|
echo "$feature_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$feature_attrs" | grep -q "*.txt filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (default branch with filter)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
|
|
|
|
md_oid="$(calc_oid "$(git cat-file -p :a.md)")"
|
|
|
|
|
txt_oid="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p my-feature:a.md)")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --include "*.md"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.md" "$md_oid" "140"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
assert_local_object "$md_oid" "140"
|
|
|
|
|
refute_local_object "$txt_oid" "120"
|
|
|
|
|
refute_local_object "$md_feature_oid" "30"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
feature="$(git rev-parse refs/heads/my-feature)"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main_attrs="$(git cat-file -p "$main:.gitattributes")"
|
2017-06-23 21:53:41 +00:00
|
|
|
[ ! $(git cat-file -p "$feature:.gitattributes") ]
|
2017-06-23 18:41:55 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
echo "$main_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$main_attrs" | grep -vq "*.txt filter=lfs diff=lfs merge=lfs"
|
2017-06-23 18:41:55 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (given branch with filter)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
|
|
|
|
md_oid="$(calc_oid "$(git cat-file -p :a.md)")"
|
|
|
|
|
txt_oid="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p my-feature:a.md)")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --include "*.md" my-feature
|
|
|
|
|
|
|
|
|
|
assert_pointer "refs/heads/my-feature" "a.md" "$md_feature_oid" "30"
|
|
|
|
|
assert_pointer "refs/heads/my-feature~1" "a.md" "$md_oid" "140"
|
|
|
|
|
|
|
|
|
|
assert_local_object "$md_oid" "140"
|
|
|
|
|
assert_local_object "$md_feature_oid" "30"
|
|
|
|
|
refute_local_object "$txt_oid" "120"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
feature="$(git rev-parse refs/heads/my-feature)"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main_attrs="$(git cat-file -p "$main:.gitattributes")"
|
2017-06-23 21:53:41 +00:00
|
|
|
feature_attrs="$(git cat-file -p "$feature:.gitattributes")"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
echo "$main_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$main_attrs" | grep -vq "*.txt filter=lfs diff=lfs merge=lfs"
|
2017-06-23 18:41:55 +00:00
|
|
|
echo "$feature_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$feature_attrs" | grep -vq "*.txt filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (default branch, exclude remote refs)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_single_remote_branch
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
md_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.md")")"
|
|
|
|
|
txt_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.txt")")"
|
|
|
|
|
md_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.md")")"
|
|
|
|
|
txt_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
git lfs migrate import
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.md" "$md_oid" "50"
|
|
|
|
|
assert_pointer "refs/heads/main" "a.txt" "$txt_oid" "30"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
assert_local_object "$md_oid" "50"
|
|
|
|
|
assert_local_object "$txt_oid" "30"
|
|
|
|
|
refute_local_object "$md_remote_oid" "140"
|
|
|
|
|
refute_local_object "$txt_remote_oid" "120"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
|
|
|
|
remote="$(git rev-parse refs/remotes/origin/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main_attrs="$(git cat-file -p "$main:.gitattributes")"
|
2017-06-23 21:53:41 +00:00
|
|
|
[ ! $(git cat-file -p "$remote:.gitattributes") ]
|
2017-06-23 18:41:55 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
echo "$main_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$main_attrs" | grep -vq "*.txt filter=lfs diff=lfs merge=lfs"
|
2017-06-23 18:41:55 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (given branch, exclude remote refs)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_remote_branches
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
md_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.md")")"
|
|
|
|
|
md_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.md")")"
|
2017-06-23 19:04:19 +00:00
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.md")")"
|
2020-06-29 16:18:57 +00:00
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
|
|
|
|
txt_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.txt")")"
|
2017-06-23 19:04:19 +00:00
|
|
|
txt_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.txt")")"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
git lfs migrate import my-feature
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.md" "$md_main_oid" "21"
|
2017-06-23 18:41:55 +00:00
|
|
|
assert_pointer "refs/heads/my-feature" "a.md" "$md_feature_oid" "31"
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.txt" "$txt_main_oid" "20"
|
2017-06-23 18:41:55 +00:00
|
|
|
assert_pointer "refs/heads/my-feature" "a.txt" "$txt_feature_oid" "30"
|
|
|
|
|
|
|
|
|
|
assert_local_object "$md_feature_oid" "31"
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_local_object "$md_main_oid" "21"
|
2017-06-23 18:41:55 +00:00
|
|
|
assert_local_object "$txt_feature_oid" "30"
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_local_object "$txt_main_oid" "20"
|
2017-06-23 18:41:55 +00:00
|
|
|
refute_local_object "$md_remote_oid" "11"
|
|
|
|
|
refute_local_object "$txt_remote_oid" "10"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
feature="$(git rev-parse refs/heads/my-feature)"
|
2020-06-29 16:18:57 +00:00
|
|
|
remote="$(git rev-parse refs/remotes/origin/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main_attrs="$(git cat-file -p "$main:.gitattributes")"
|
2017-06-23 21:53:41 +00:00
|
|
|
[ ! $(git cat-file -p "$remote:.gitattributes") ]
|
|
|
|
|
feature_attrs="$(git cat-file -p "$feature:.gitattributes")"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
echo "$main_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$main_attrs" | grep -q "*.txt filter=lfs diff=lfs merge=lfs"
|
2017-06-23 18:41:55 +00:00
|
|
|
echo "$feature_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$feature_attrs" | grep -vq "*.txt filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2017-11-20 17:48:50 +00:00
|
|
|
begin_test "migrate import (given ref, --skip-fetch)"
|
2017-11-17 16:46:13 +00:00
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_single_remote_branch
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
md_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.md")")"
|
|
|
|
|
md_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.md")")"
|
|
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
|
|
|
|
txt_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.txt")")"
|
2017-11-17 16:46:13 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
git tag pseudo-remote "$(git rev-parse refs/remotes/origin/main)"
|
|
|
|
|
# Remove the refs/remotes/origin/main ref, and instruct 'git lfs migrate' to
|
2017-11-17 16:46:13 +00:00
|
|
|
# not fetch it.
|
2020-06-29 16:18:57 +00:00
|
|
|
git update-ref -d refs/remotes/origin/main
|
2017-11-17 16:46:13 +00:00
|
|
|
|
2017-11-20 17:48:50 +00:00
|
|
|
git lfs migrate import --skip-fetch
|
2017-11-17 16:46:13 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.md" "$md_main_oid" "50"
|
2017-11-17 16:46:13 +00:00
|
|
|
assert_pointer "pseudo-remote" "a.md" "$md_remote_oid" "140"
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.txt" "$txt_main_oid" "30"
|
2017-11-17 16:46:13 +00:00
|
|
|
assert_pointer "pseudo-remote" "a.txt" "$txt_remote_oid" "120"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_local_object "$md_main_oid" "50"
|
|
|
|
|
assert_local_object "$txt_main_oid" "30"
|
2017-11-17 16:46:13 +00:00
|
|
|
assert_local_object "$md_remote_oid" "140"
|
|
|
|
|
assert_local_object "$txt_remote_oid" "120"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2017-11-17 16:46:13 +00:00
|
|
|
remote="$(git rev-parse pseudo-remote)"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main_attrs="$(git cat-file -p "$main:.gitattributes")"
|
2017-11-17 16:46:13 +00:00
|
|
|
remote_attrs="$(git cat-file -p "$remote:.gitattributes")"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
echo "$main_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$main_attrs" | grep -q "*.txt filter=lfs diff=lfs merge=lfs"
|
2017-11-17 16:46:13 +00:00
|
|
|
echo "$remote_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$remote_attrs" | grep -q "*.txt filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2017-12-11 23:24:06 +00:00
|
|
|
begin_test "migrate import (un-annotated tags)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_single_local_branch_with_tags
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
2017-12-11 23:24:06 +00:00
|
|
|
|
|
|
|
|
git lfs migrate import --everything
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.txt" "$txt_main_oid" "2"
|
|
|
|
|
assert_local_object "$txt_main_oid" "2"
|
2017-12-11 23:24:06 +00:00
|
|
|
|
|
|
|
|
git tag --points-at "$(git rev-parse HEAD)" | grep -q "v1.0.0"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (annotated tags)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_single_local_branch_with_annotated_tags
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
2017-12-11 23:24:06 +00:00
|
|
|
|
|
|
|
|
git lfs migrate import --everything
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.txt" "$txt_main_oid" "2"
|
|
|
|
|
assert_local_object "$txt_main_oid" "2"
|
2017-12-11 23:24:06 +00:00
|
|
|
|
|
|
|
|
git tag --points-at "$(git rev-parse HEAD)" | grep -q "v1.0.0"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2017-06-23 18:41:55 +00:00
|
|
|
begin_test "migrate import (include/exclude ref)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_remote_branches
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
md_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.md")")"
|
|
|
|
|
md_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.md")")"
|
2017-06-23 19:04:19 +00:00
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.md")")"
|
2020-06-29 16:18:57 +00:00
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
|
|
|
|
txt_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.txt")")"
|
2017-06-23 19:04:19 +00:00
|
|
|
txt_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.txt")")"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
git lfs migrate import \
|
|
|
|
|
--include-ref=refs/heads/my-feature \
|
2020-06-29 16:18:57 +00:00
|
|
|
--exclude-ref=refs/heads/main
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
assert_pointer "refs/heads/my-feature" "a.md" "$md_feature_oid" "31"
|
|
|
|
|
assert_pointer "refs/heads/my-feature" "a.txt" "$txt_feature_oid" "30"
|
|
|
|
|
|
|
|
|
|
assert_local_object "$md_feature_oid" "31"
|
2020-06-29 16:18:57 +00:00
|
|
|
refute_local_object "$md_main_oid" "21"
|
2017-06-23 18:41:55 +00:00
|
|
|
assert_local_object "$txt_feature_oid" "30"
|
2020-06-29 16:18:57 +00:00
|
|
|
refute_local_object "$txt_main_oid" "20"
|
2017-06-23 18:41:55 +00:00
|
|
|
refute_local_object "$md_remote_oid" "11"
|
|
|
|
|
refute_local_object "$txt_remote_oid" "10"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
feature="$(git rev-parse refs/heads/my-feature)"
|
2020-06-29 16:18:57 +00:00
|
|
|
remote="$(git rev-parse refs/remotes/origin/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
[ ! $(git cat-file -p "$main:.gitattributes") ]
|
2017-06-23 21:53:41 +00:00
|
|
|
[ ! $(git cat-file -p "$remote:.gitattributes") ]
|
|
|
|
|
feature_attrs="$(git cat-file -p "$feature:.gitattributes")"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
2017-12-13 19:13:11 +00:00
|
|
|
echo "$feature_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$feature_attrs" | grep -q "*.txt filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (include/exclude ref args)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_remote_branches
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
md_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.md")")"
|
|
|
|
|
md_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.md")")"
|
2017-12-13 19:13:11 +00:00
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.md")")"
|
2020-06-29 16:18:57 +00:00
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
|
|
|
|
txt_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.txt")")"
|
2017-12-13 19:13:11 +00:00
|
|
|
txt_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.txt")")"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
git lfs migrate import my-feature ^main
|
2017-12-13 19:13:11 +00:00
|
|
|
|
|
|
|
|
assert_pointer "refs/heads/my-feature" "a.md" "$md_feature_oid" "31"
|
|
|
|
|
assert_pointer "refs/heads/my-feature" "a.txt" "$txt_feature_oid" "30"
|
|
|
|
|
|
|
|
|
|
assert_local_object "$md_feature_oid" "31"
|
2020-06-29 16:18:57 +00:00
|
|
|
refute_local_object "$md_main_oid" "21"
|
2017-12-13 19:13:11 +00:00
|
|
|
assert_local_object "$txt_feature_oid" "30"
|
2020-06-29 16:18:57 +00:00
|
|
|
refute_local_object "$txt_main_oid" "20"
|
2017-12-13 19:13:11 +00:00
|
|
|
refute_local_object "$md_remote_oid" "11"
|
|
|
|
|
refute_local_object "$txt_remote_oid" "10"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2017-12-13 19:13:11 +00:00
|
|
|
feature="$(git rev-parse refs/heads/my-feature)"
|
2020-06-29 16:18:57 +00:00
|
|
|
remote="$(git rev-parse refs/remotes/origin/main)"
|
2017-12-13 19:13:11 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
[ ! $(git cat-file -p "$main:.gitattributes") ]
|
2017-12-13 19:13:11 +00:00
|
|
|
[ ! $(git cat-file -p "$remote:.gitattributes") ]
|
|
|
|
|
feature_attrs="$(git cat-file -p "$feature:.gitattributes")"
|
|
|
|
|
|
2017-06-23 18:41:55 +00:00
|
|
|
echo "$feature_attrs" | grep -q "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$feature_attrs" | grep -q "*.txt filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (include/exclude ref with filter)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_remote_branches
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
md_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.md")")"
|
|
|
|
|
md_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.md")")"
|
2017-06-23 19:04:19 +00:00
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.md")")"
|
2020-06-29 16:18:57 +00:00
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
|
|
|
|
txt_remote_oid="$(calc_oid "$(git cat-file -p "refs/remotes/origin/main:a.txt")")"
|
2017-06-23 19:04:19 +00:00
|
|
|
txt_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.txt")")"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
git lfs migrate import \
|
|
|
|
|
--include="*.txt" \
|
|
|
|
|
--include-ref=refs/heads/my-feature \
|
2020-06-29 16:18:57 +00:00
|
|
|
--exclude-ref=refs/heads/main
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
assert_pointer "refs/heads/my-feature" "a.txt" "$txt_feature_oid" "30"
|
|
|
|
|
|
|
|
|
|
refute_local_object "$md_feature_oid" "31"
|
2020-06-29 16:18:57 +00:00
|
|
|
refute_local_object "$md_main_oid" "21"
|
2017-06-23 18:41:55 +00:00
|
|
|
assert_local_object "$txt_feature_oid" "30"
|
2020-06-29 16:18:57 +00:00
|
|
|
refute_local_object "$txt_main_oid" "20"
|
2017-06-23 18:41:55 +00:00
|
|
|
refute_local_object "$md_remote_oid" "11"
|
|
|
|
|
refute_local_object "$txt_remote_oid" "10"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
feature="$(git rev-parse refs/heads/my-feature)"
|
2020-06-29 16:18:57 +00:00
|
|
|
remote="$(git rev-parse refs/remotes/origin/main)"
|
2017-06-23 21:53:41 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
[ ! $(git cat-file -p "$main:.gitattributes") ]
|
2017-06-23 21:53:41 +00:00
|
|
|
[ ! $(git cat-file -p "$remote:.gitattributes") ]
|
|
|
|
|
feature_attrs="$(git cat-file -p "$feature:.gitattributes")"
|
2017-06-23 18:41:55 +00:00
|
|
|
|
|
|
|
|
echo "$feature_attrs" | grep -vq "*.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$feature_attrs" | grep -q "*.txt filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2017-06-26 17:27:21 +00:00
|
|
|
|
2020-10-09 00:50:34 +00:00
|
|
|
begin_test "migrate import (above)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
setup_single_local_branch_untracked
|
|
|
|
|
|
|
|
|
|
md_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.md")")"
|
|
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --above 121B
|
|
|
|
|
# Ensure that 'a.md', whose size is above our 121 byte threshold
|
|
|
|
|
# was converted into a git-lfs pointer by the migration.
|
|
|
|
|
assert_local_object "$md_main_oid" "140"
|
|
|
|
|
assert_pointer "refs/heads/main" "a.md" "$md_main_oid" "140"
|
2020-11-23 21:52:12 +00:00
|
|
|
refute_pointer "refs/heads/main" "a.txt" "$txt_main_oid" "120"
|
2020-10-09 00:50:34 +00:00
|
|
|
refute_local_object "$txt_main_oid" "120"
|
|
|
|
|
|
|
|
|
|
# The migration should have identified that *.md files are now
|
|
|
|
|
# tracked because it migrated a.md
|
|
|
|
|
main_attrs="$(git cat-file -p "$main:.gitattributes")"
|
|
|
|
|
|
2021-05-25 15:05:58 +00:00
|
|
|
echo "$main_attrs" | grep -q "/a.md filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
echo "$main_attrs" | grep -vq "/a.txt filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
git check-attr filter -- a.txt | grep -vq lfs
|
2020-10-09 00:50:34 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2020-11-23 21:54:34 +00:00
|
|
|
begin_test "migrate import (above without extension)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
setup_single_local_branch_untracked "just-b"
|
|
|
|
|
|
|
|
|
|
b_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:just-b")")"
|
|
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --above 121B
|
|
|
|
|
# Ensure that 'b', whose size is above our 121 byte threshold
|
|
|
|
|
# was converted into a git-lfs pointer by the migration.
|
|
|
|
|
assert_local_object "$b_main_oid" "140"
|
|
|
|
|
assert_pointer "refs/heads/main" "just-b" "$b_main_oid" "140"
|
|
|
|
|
refute_pointer "refs/heads/main" "a.txt" "$txt_main_oid" "120"
|
|
|
|
|
refute_local_object "$txt_main_oid" "120"
|
|
|
|
|
|
|
|
|
|
# The migration should have identified that /b is now tracked
|
|
|
|
|
# because it migrated it.
|
|
|
|
|
main_attrs="$(git cat-file -p "$main:.gitattributes")"
|
|
|
|
|
|
|
|
|
|
echo "$main_attrs" | grep -q "/just-b filter=lfs diff=lfs merge=lfs"
|
2021-05-25 15:05:58 +00:00
|
|
|
echo "$main_attrs" | grep -vq "/a.txt filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
git check-attr filter -- a.txt | grep -vq lfs
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (above with multiple files)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
# It is important that this file sort after "a.txt".
|
|
|
|
|
setup_single_local_branch_untracked "b.txt"
|
|
|
|
|
|
|
|
|
|
a_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
|
|
|
|
b_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:b.txt")")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --above 121B
|
|
|
|
|
# Ensure that 'a.md', whose size is above our 121 byte threshold
|
|
|
|
|
# was converted into a git-lfs pointer by the migration.
|
|
|
|
|
assert_local_object "$b_main_oid" "140"
|
|
|
|
|
assert_pointer "refs/heads/main" "b.txt" "$b_main_oid" "140"
|
|
|
|
|
refute_pointer "refs/heads/main" "a.txt" "$a_main_oid" "120"
|
|
|
|
|
refute_local_object "$a_main_oid" "120"
|
|
|
|
|
|
|
|
|
|
# The migration should have identified that *.md files are now
|
|
|
|
|
# tracked because it migrated a.md
|
|
|
|
|
main_attrs="$(git cat-file -p "$main:.gitattributes")"
|
|
|
|
|
|
|
|
|
|
echo "$main_attrs" | grep -q "/b.txt filter=lfs diff=lfs merge=lfs"
|
|
|
|
|
git check-attr filter -- a.txt | grep -vq lfs
|
2020-11-23 21:54:34 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2021-12-08 14:45:55 +00:00
|
|
|
begin_test "migrate import (above with include or exclude)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
setup_single_local_branch_untracked
|
|
|
|
|
|
|
|
|
|
md_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.md")")"
|
|
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --above 121B --include "*.md" && exit 1
|
|
|
|
|
git lfs migrate import --above 121B --exclude "*.txt" && exit 1
|
|
|
|
|
git lfs migrate import --above 121B --fixup && exit 1
|
|
|
|
|
true
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2017-06-26 17:27:21 +00:00
|
|
|
begin_test "migrate import (existing .gitattributes)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_gitattrs
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2017-06-26 17:27:21 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "$main:a.txt")")"
|
2017-06-26 17:27:21 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
git lfs migrate import --yes --include-ref=refs/heads/main --include="*.txt"
|
2017-06-26 17:27:21 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_local_object "$txt_main_oid" "120"
|
2017-06-26 17:27:21 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
|
|
|
|
prev="$(git rev-parse refs/heads/main^1)"
|
2017-06-26 17:27:21 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
diff -u <(git cat-file -p $main:.gitattributes) <(cat <<-EOF
|
2017-06-26 17:27:21 +00:00
|
|
|
*.txt filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
*.other filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
EOF)
|
|
|
|
|
|
|
|
|
|
diff -u <(git cat-file -p $prev:.gitattributes) <(cat <<-EOF
|
|
|
|
|
*.txt filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
EOF)
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2017-07-05 16:30:29 +00:00
|
|
|
|
2020-03-11 14:46:01 +00:00
|
|
|
begin_test "migrate import (--exclude with existing .gitattributes)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_gitattrs
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
2020-03-11 14:46:01 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "$main:a.txt")")"
|
2020-03-11 14:46:01 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
git lfs migrate import --yes --include-ref=refs/heads/main --include="*.txt" --exclude="*.bin"
|
2020-03-11 14:46:01 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_local_object "$txt_main_oid" "120"
|
2020-03-11 14:46:01 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main="$(git rev-parse refs/heads/main)"
|
|
|
|
|
prev="$(git rev-parse refs/heads/main^1)"
|
2020-03-11 14:46:01 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
diff -u <(git cat-file -p $main:.gitattributes) <(cat <<-EOF
|
2020-03-11 14:46:01 +00:00
|
|
|
*.txt filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
*.other filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
*.bin !text -filter -merge -diff
|
|
|
|
|
EOF)
|
|
|
|
|
|
|
|
|
|
diff -u <(git cat-file -p $prev:.gitattributes) <(cat <<-EOF
|
|
|
|
|
*.txt filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
*.bin !text -filter -merge -diff
|
|
|
|
|
EOF)
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2022-01-24 01:56:50 +00:00
|
|
|
begin_test "migrate import (existing .gitattributes with different permissions)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
# Windows lacks POSIX permissions.
|
|
|
|
|
[ "$IS_WINDOWS" -eq 1 ] && exit 0
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_gitattrs 0755
|
|
|
|
|
|
|
|
|
|
main="$(git rev-parse refs/heads/main)"
|
|
|
|
|
|
|
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "$main:a.txt")")"
|
|
|
|
|
|
|
|
|
|
[ -x .gitattributes ]
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --yes --include-ref=refs/heads/main --include="*.txt"
|
|
|
|
|
|
|
|
|
|
[ ! -x .gitattributes ]
|
|
|
|
|
|
|
|
|
|
assert_local_object "$txt_main_oid" "120"
|
|
|
|
|
|
|
|
|
|
main="$(git rev-parse refs/heads/main)"
|
|
|
|
|
prev="$(git rev-parse refs/heads/main^1)"
|
|
|
|
|
|
|
|
|
|
diff -u <(git cat-file -p $main:.gitattributes) <(cat <<-EOF
|
|
|
|
|
*.txt filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
*.other filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
EOF
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
diff -u <(git cat-file -p $prev:.gitattributes) <(cat <<-EOF
|
|
|
|
|
*.txt filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
EOF
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
attrs_main_sha="$(git show $main:.gitattributes | git hash-object --stdin)"
|
|
|
|
|
txt_main_sha="$(git show $main:a.txt | git hash-object --stdin)"
|
|
|
|
|
|
|
|
|
|
diff -u <(git ls-tree $main) <(cat <<-EOF
|
|
|
|
|
100644 blob $attrs_main_sha .gitattributes
|
|
|
|
|
100644 blob $txt_main_sha a.txt
|
|
|
|
|
EOF
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2022-01-24 07:00:50 +00:00
|
|
|
begin_test "migrate import (existing .gitattributes symlink)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_gitattrs link
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --yes --include-ref=refs/heads/main --include="*.txt" 2>&1 | tee migrate.log
|
|
|
|
|
if [ ${PIPESTATUS[0]} -eq 0 ]; then
|
|
|
|
|
echo >&2 "fatal: expected git lfs migrate import to fail, didn't"
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
grep "migrate: expected '.gitattributes' to be a file, got a symbolic link" migrate.log
|
|
|
|
|
|
|
|
|
|
main="$(git rev-parse refs/heads/main)"
|
|
|
|
|
|
|
|
|
|
attrs_main_sha="$(git show $main:.gitattributes | git hash-object --stdin)"
|
|
|
|
|
|
|
|
|
|
diff -u <(git ls-tree $main -- .gitattributes) <(cat <<-EOF
|
|
|
|
|
120000 blob $attrs_main_sha .gitattributes
|
|
|
|
|
EOF
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2019-06-25 18:48:03 +00:00
|
|
|
begin_test "migrate import (identical contents, different permissions)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
# Windows lacks POSIX permissions.
|
|
|
|
|
[ "$IS_WINDOWS" -eq 1 ] && exit 0
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
2020-06-29 16:18:57 +00:00
|
|
|
git checkout main
|
2019-06-25 18:48:03 +00:00
|
|
|
|
|
|
|
|
echo "foo" >foo.dat
|
|
|
|
|
git add .
|
|
|
|
|
git commit -m "add file"
|
|
|
|
|
|
|
|
|
|
chmod u+x foo.dat
|
|
|
|
|
git add .
|
|
|
|
|
git commit -m "make file executable"
|
|
|
|
|
|
|
|
|
|
# Verify we have executable permissions.
|
2022-01-24 01:57:11 +00:00
|
|
|
[ -x foo.dat ]
|
2019-06-25 18:48:03 +00:00
|
|
|
|
|
|
|
|
git lfs migrate import --everything --include="*.dat"
|
|
|
|
|
|
|
|
|
|
# Verify we have executable permissions.
|
2022-01-24 01:57:11 +00:00
|
|
|
[ -x foo.dat ]
|
2019-06-25 18:48:03 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2020-05-13 21:48:32 +00:00
|
|
|
begin_test "migrate import (tags with same name as branches)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
2020-06-29 16:18:57 +00:00
|
|
|
git checkout main
|
2020-05-13 21:48:32 +00:00
|
|
|
|
|
|
|
|
contents="hello"
|
|
|
|
|
oid=$(calc_oid "$contents")
|
|
|
|
|
printf "$contents" >hello.dat
|
|
|
|
|
git add .
|
|
|
|
|
git commit -m "add file"
|
|
|
|
|
|
|
|
|
|
git branch foo
|
|
|
|
|
git tag foo
|
|
|
|
|
git tag bar
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --everything --include="*.dat"
|
|
|
|
|
|
|
|
|
|
[ "$(git rev-parse refs/heads/foo)" = "$(git rev-parse refs/tags/foo)" ]
|
|
|
|
|
[ "$(git rev-parse refs/heads/foo)" = "$(git rev-parse refs/tags/bar)" ]
|
|
|
|
|
|
|
|
|
|
assert_pointer "refs/heads/foo" hello.dat "$oid" 5
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2017-07-05 16:30:29 +00:00
|
|
|
begin_test "migrate import (bare repository)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
2017-07-05 16:53:09 +00:00
|
|
|
setup_multiple_local_branches
|
2017-07-05 16:37:46 +00:00
|
|
|
make_bare
|
2017-07-05 16:30:29 +00:00
|
|
|
|
|
|
|
|
git lfs migrate import \
|
2020-06-29 16:18:57 +00:00
|
|
|
--include-ref=main
|
2017-07-05 16:30:29 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
2017-08-08 16:58:19 +00:00
|
|
|
|
2017-09-13 21:11:25 +00:00
|
|
|
begin_test "migrate import (nested sub-trees, no filter)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_single_local_branch_deep_trees
|
|
|
|
|
|
|
|
|
|
oid="$(calc_oid "$(git cat-file -p :foo/bar/baz/a.txt)")"
|
|
|
|
|
size="$(git cat-file -p :foo/bar/baz/a.txt | wc -c | awk '{ print $1 }')"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --everything
|
|
|
|
|
|
|
|
|
|
assert_local_object "$oid" "$size"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2017-08-08 16:58:19 +00:00
|
|
|
begin_test "migrate import (prefix include(s))"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
commands,t: gitattributes migrate filepath parsing
The --include and --exclude (-I and -X) options to the
"git lfs migrate" command allow the user to specify filepath
filters which select matching files to migrate and which are
also used to populate any .gitattributes files written by the
import or export operations.
This latter functionality implies that we need to parse
any filepath patterns supplied by these options using
gitattributes(5) rules, since the patterns will be copied
directly into .gitattributes files. (See the use of the
trackedFromFilter() and trackedFromExportFilter() functions
in particular.)
However, all other Git LFS commands which parse --include
and --exclude options, such as "git lfs fetch" and
"git lfs ls-files", expect to treat any supplied patterns
according to gitignore(5) rules. (This aligns with, for
instance, how the -x option to "git ls-files" works.)
We therefore introduce a buildFilepathFilterWithPatternType()
function which the "git lfs migrate" command can use to
specify the filepathfilter.GitAttributes parsing mode for
its filter, while the other commands continue to use the
filepathfilter.GitIgnore mode.
Note that this change change will have several consequences.
On one hand, patterns such as "*.bin" will only match against
files, not directories, which will restore the behaviour of
"git lfs migrate" in this regard prior to v3.0.0 and the
changes from PR #4556.
On the other hand, patterns such as "foo" will no longer
recursively match everything inside a directory, and "foo/**"
must be used instead. This is in line with how Git's native
gitattributes(5) matching works.
We therefore adjust one existing test to use a directory
match of the form "foo/**" instead of "foo", and add one new
test which confirms that only files named "*.txt" match a
pattern of that form, instead of all files in any directory
whose name has that form, such as a file like "foo.txt/bar.md".
This new test fails without the changes to the "git lfs migrate"
command introduced in this commit.
2021-12-03 00:09:35 +00:00
|
|
|
includes="foo/bar/baz/** foo/**/baz/a.txt *.txt"
|
2017-08-08 16:58:19 +00:00
|
|
|
for include in $includes; do
|
|
|
|
|
setup_single_local_branch_deep_trees
|
|
|
|
|
|
|
|
|
|
oid="$(calc_oid "$(git cat-file -p :foo/bar/baz/a.txt)")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --include="$include"
|
|
|
|
|
|
|
|
|
|
assert_local_object "$oid" 120
|
2017-08-08 20:31:28 +00:00
|
|
|
|
|
|
|
|
cd ..
|
2017-08-08 16:58:19 +00:00
|
|
|
done
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2017-09-07 17:47:17 +00:00
|
|
|
|
|
|
|
|
begin_test "migrate import (--everything)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
2020-06-29 16:18:57 +00:00
|
|
|
git checkout main
|
2017-09-07 17:47:17 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
main_txt_oid="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
main_md_oid="$(calc_oid "$(git cat-file -p :a.md)")"
|
2017-09-07 17:47:17 +00:00
|
|
|
feature_md_oid="$(calc_oid "$(git cat-file -p my-feature:a.md)")"
|
2020-06-29 16:18:57 +00:00
|
|
|
main_txt_size="$(git cat-file -p :a.txt | wc -c | awk '{ print $1 }')"
|
|
|
|
|
main_md_size="$(git cat-file -p :a.md | wc -c | awk '{ print $1 }')"
|
2017-09-07 17:47:17 +00:00
|
|
|
feature_md_size="$(git cat-file -p my-feature:a.md | wc -c | awk '{ print $1 }')"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --everything
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "main" "a.txt" "$main_txt_oid" "$main_txt_size"
|
|
|
|
|
assert_pointer "main" "a.md" "$main_md_oid" "$main_md_size"
|
2017-09-07 17:47:17 +00:00
|
|
|
assert_pointer "my-feature" "a.md" "$feature_md_oid" "$feature_md_size"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2017-11-16 23:45:30 +00:00
|
|
|
begin_test "migrate import (ambiguous reference)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
|
|
|
|
# Create an ambiguously named reference sharing the name as the SHA-1 of
|
|
|
|
|
# "HEAD".
|
2017-11-17 16:11:17 +00:00
|
|
|
sha="$(git rev-parse HEAD)"
|
2017-11-16 23:45:30 +00:00
|
|
|
git tag "$sha"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --everything
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2017-09-07 17:47:17 +00:00
|
|
|
|
|
|
|
|
begin_test "migrate import (--everything with args)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
[ "$(git lfs migrate import --everything main 2>&1)" = \
|
2021-12-13 18:53:50 +00:00
|
|
|
"Cannot use --everything with explicit reference arguments" ]
|
2017-09-07 17:47:17 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (--everything with --include-ref)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
[ "$(git lfs migrate import --everything --include-ref=refs/heads/main 2>&1)" = \
|
2021-12-13 18:53:50 +00:00
|
|
|
"Cannot use --everything with --include-ref or --exclude-ref" ]
|
2017-09-07 17:47:17 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (--everything with --exclude-ref)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
[ "$(git lfs migrate import --everything --exclude-ref=refs/heads/main 2>&1)" = \
|
2021-12-13 18:53:50 +00:00
|
|
|
"Cannot use --everything with --include-ref or --exclude-ref" ]
|
2017-09-07 17:47:17 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
2017-12-20 13:11:25 +00:00
|
|
|
|
|
|
|
|
begin_test "migrate import (--everything and --include with glob pattern)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
md_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.md")")"
|
|
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
2017-12-20 13:11:25 +00:00
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.md")")"
|
|
|
|
|
txt_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.txt")")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --verbose --everything --include='*.[mM][dD]'
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.md" "$md_main_oid" "140"
|
2017-12-20 13:11:25 +00:00
|
|
|
assert_pointer "refs/heads/my-feature" "a.md" "$md_feature_oid" "30"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_local_object "$md_main_oid" "140"
|
2017-12-20 13:11:25 +00:00
|
|
|
assert_local_object "$md_feature_oid" "30"
|
2020-06-29 16:18:57 +00:00
|
|
|
refute_local_object "$txt_main_oid"
|
2017-12-20 13:11:25 +00:00
|
|
|
refute_local_object "$txt_feature_oid"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2017-12-20 13:47:37 +00:00
|
|
|
|
2019-06-24 15:55:17 +00:00
|
|
|
begin_test "migrate import (--everything with tag pointing to tag)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
md_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.md")")"
|
|
|
|
|
txt_main_oid="$(calc_oid "$(git cat-file -p "refs/heads/main:a.txt")")"
|
2019-06-24 15:55:17 +00:00
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.md")")"
|
|
|
|
|
txt_feature_oid="$(calc_oid "$(git cat-file -p "refs/heads/my-feature:a.txt")")"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
git tag -a -m abc abc refs/heads/main
|
2019-06-24 15:55:17 +00:00
|
|
|
git tag -a -m def def refs/tags/abc
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --verbose --everything --include='*.[mM][dD]'
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.md" "$md_main_oid" "140"
|
|
|
|
|
assert_pointer "refs/tags/abc" "a.md" "$md_main_oid" "140"
|
|
|
|
|
assert_pointer "refs/tags/def" "a.md" "$md_main_oid" "140"
|
2019-06-24 15:55:17 +00:00
|
|
|
assert_pointer "refs/heads/my-feature" "a.md" "$md_feature_oid" "30"
|
|
|
|
|
|
|
|
|
|
git tag --points-at refs/tags/abc | grep -q def
|
|
|
|
|
! git tag --points-at refs/tags/def | grep -q abc
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_local_object "$md_main_oid" "140"
|
2019-06-24 15:55:17 +00:00
|
|
|
assert_local_object "$md_feature_oid" "30"
|
2020-06-29 16:18:57 +00:00
|
|
|
refute_local_object "$txt_main_oid"
|
2019-06-24 15:55:17 +00:00
|
|
|
refute_local_object "$txt_feature_oid"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2017-12-20 13:47:37 +00:00
|
|
|
begin_test "migrate import (nested sub-trees and --include with wildcard)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_single_local_branch_deep_trees
|
|
|
|
|
|
|
|
|
|
oid="$(calc_oid "$(git cat-file -p :foo/bar/baz/a.txt)")"
|
|
|
|
|
size="$(git cat-file -p :foo/bar/baz/a.txt | wc -c | awk '{ print $1 }')"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --include="**/*ar/**"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "foo/bar/baz/a.txt" "$oid" "$size"
|
2017-12-20 13:47:37 +00:00
|
|
|
assert_local_object "$oid" "$size"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2017-12-20 17:21:39 +00:00
|
|
|
|
|
|
|
|
begin_test "migrate import (handle copies of files)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_single_local_branch_deep_trees
|
|
|
|
|
|
|
|
|
|
# add the object from the sub-tree to the root directory
|
|
|
|
|
cp foo/bar/baz/a.txt a.txt
|
|
|
|
|
git add a.txt
|
|
|
|
|
git commit -m "duplicated file"
|
|
|
|
|
|
|
|
|
|
oid_root="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
oid_tree="$(calc_oid "$(git cat-file -p :foo/bar/baz/a.txt)")"
|
|
|
|
|
size="$(git cat-file -p :foo/bar/baz/a.txt | wc -c | awk '{ print $1 }')"
|
|
|
|
|
|
|
|
|
|
# only import objects under "foo"
|
|
|
|
|
git lfs migrate import --include="foo/**"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "foo/bar/baz/a.txt" "$oid_tree" "$size"
|
2017-12-20 17:21:39 +00:00
|
|
|
assert_local_object "$oid_tree" "$size"
|
|
|
|
|
|
|
|
|
|
# "a.txt" is not under "foo" and therefore should not be in LFS
|
|
|
|
|
oid_root_after_migration="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
[ "$oid_root" = "$oid_root_after_migration" ]
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2018-03-21 00:37:14 +00:00
|
|
|
|
commands,t: gitattributes migrate filepath parsing
The --include and --exclude (-I and -X) options to the
"git lfs migrate" command allow the user to specify filepath
filters which select matching files to migrate and which are
also used to populate any .gitattributes files written by the
import or export operations.
This latter functionality implies that we need to parse
any filepath patterns supplied by these options using
gitattributes(5) rules, since the patterns will be copied
directly into .gitattributes files. (See the use of the
trackedFromFilter() and trackedFromExportFilter() functions
in particular.)
However, all other Git LFS commands which parse --include
and --exclude options, such as "git lfs fetch" and
"git lfs ls-files", expect to treat any supplied patterns
according to gitignore(5) rules. (This aligns with, for
instance, how the -x option to "git ls-files" works.)
We therefore introduce a buildFilepathFilterWithPatternType()
function which the "git lfs migrate" command can use to
specify the filepathfilter.GitAttributes parsing mode for
its filter, while the other commands continue to use the
filepathfilter.GitIgnore mode.
Note that this change change will have several consequences.
On one hand, patterns such as "*.bin" will only match against
files, not directories, which will restore the behaviour of
"git lfs migrate" in this regard prior to v3.0.0 and the
changes from PR #4556.
On the other hand, patterns such as "foo" will no longer
recursively match everything inside a directory, and "foo/**"
must be used instead. This is in line with how Git's native
gitattributes(5) matching works.
We therefore adjust one existing test to use a directory
match of the form "foo/**" instead of "foo", and add one new
test which confirms that only files named "*.txt" match a
pattern of that form, instead of all files in any directory
whose name has that form, such as a file like "foo.txt/bar.md".
This new test fails without the changes to the "git lfs migrate"
command introduced in this commit.
2021-12-03 00:09:35 +00:00
|
|
|
begin_test "migrate import (filter matches files only)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_single_local_branch_same_file_tree_ext
|
|
|
|
|
|
|
|
|
|
txt_root_oid="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
txt_foo_oid="$(calc_oid "$(git cat-file -p :foo/a.txt)")"
|
|
|
|
|
md_bar_oid="$(calc_oid "$(git cat-file -p :bar.txt/b.md)")"
|
|
|
|
|
txt_bar_oid="$(calc_oid "$(git cat-file -p :bar.txt/b.txt)")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --include="*.txt"
|
|
|
|
|
|
|
|
|
|
assert_local_object "$txt_root_oid" "120"
|
|
|
|
|
assert_local_object "$txt_foo_oid" "120"
|
|
|
|
|
assert_local_object "$txt_bar_oid" "120"
|
|
|
|
|
refute_local_object "$md_bar_oid"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2018-03-19 13:41:35 +00:00
|
|
|
begin_test "migrate import (--object-map)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches
|
|
|
|
|
|
|
|
|
|
output_dir=$(mktemp -d)
|
|
|
|
|
|
|
|
|
|
git log --all --pretty='format:%H' > "${output_dir}/old_sha.txt"
|
|
|
|
|
git lfs migrate import --everything --object-map "${output_dir}/object-map.txt"
|
|
|
|
|
git log --all --pretty='format:%H' > "${output_dir}/new_sha.txt"
|
|
|
|
|
paste -d',' "${output_dir}/old_sha.txt" "${output_dir}/new_sha.txt" > "${output_dir}/expected-map.txt"
|
|
|
|
|
|
2018-03-21 03:20:19 +00:00
|
|
|
diff -u <(sort "${output_dir}/expected-map.txt") <(sort "${output_dir}/object-map.txt")
|
2018-03-19 13:41:35 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
2018-03-29 01:45:56 +00:00
|
|
|
|
2018-03-21 00:37:14 +00:00
|
|
|
begin_test "migrate import (--include with space)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_space
|
|
|
|
|
|
|
|
|
|
oid="$(calc_oid "$(git cat-file -p :"a file.txt")")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --include "a file.txt"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a file.txt" "$oid" 50
|
2018-03-21 00:37:14 +00:00
|
|
|
cat .gitattributes
|
|
|
|
|
if [ 1 -ne "$(grep -c "a\[\[:space:\]\]file.txt" .gitattributes)" ]; then
|
|
|
|
|
echo >&2 "fatal: expected \"a[[:space:]]file.txt\" to appear in .gitattributes"
|
|
|
|
|
echo >&2 "fatal: got"
|
|
|
|
|
sed -e 's/^/ /g' < .gitattributes >&2
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
2018-04-14 09:47:20 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (handle symbolic link)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_symlink
|
|
|
|
|
|
|
|
|
|
txt_oid="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
link_oid="$(calc_oid "$(git cat-file -p :link.txt)")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --include="*.txt"
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.txt" "$txt_oid" "120"
|
2018-04-14 09:47:20 +00:00
|
|
|
|
|
|
|
|
assert_local_object "$txt_oid" "120"
|
|
|
|
|
# "link.txt" is a symbolic link so it should be not in LFS
|
|
|
|
|
refute_local_object "$link_oid" "5"
|
|
|
|
|
)
|
2018-03-21 00:37:14 +00:00
|
|
|
end_test
|
2018-06-08 20:15:48 +00:00
|
|
|
|
|
|
|
|
begin_test "migrate import (commit --allow-empty)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
reponame="migrate---allow-empty"
|
|
|
|
|
git init "$reponame"
|
|
|
|
|
cd "$reponame"
|
|
|
|
|
|
|
|
|
|
git commit --allow-empty -m "initial commit"
|
|
|
|
|
|
|
|
|
|
original_head="$(git rev-parse HEAD)"
|
|
|
|
|
git lfs migrate import --everything
|
|
|
|
|
migrated_head="$(git rev-parse HEAD)"
|
|
|
|
|
|
|
|
|
|
assert_ref_unmoved "HEAD" "$original_head" "$migrated_head"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2018-06-13 19:07:19 +00:00
|
|
|
|
|
|
|
|
begin_test "migrate import (multiple remotes)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_remotes
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
original_main="$(git rev-parse main)"
|
2018-06-13 19:07:19 +00:00
|
|
|
|
|
|
|
|
git lfs migrate import
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
migrated_main="$(git rev-parse main)"
|
2018-06-13 19:07:19 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_ref_unmoved "main" "$original_main" "$migrated_main"
|
2018-06-13 19:07:19 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
2018-07-16 22:08:24 +00:00
|
|
|
|
2021-03-26 22:39:22 +00:00
|
|
|
begin_test "migrate import (dirty copy, default negative answer)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_dirty_copy
|
|
|
|
|
|
|
|
|
|
original_main="$(git rev-parse main)"
|
|
|
|
|
|
|
|
|
|
echo | git lfs migrate import --everything 2>&1 | tee migrate.log
|
|
|
|
|
grep "migrate: working copy must not be dirty" migrate.log
|
|
|
|
|
|
|
|
|
|
migrated_main="$(git rev-parse main)"
|
|
|
|
|
|
|
|
|
|
assert_ref_unmoved "main" "$original_main" "$migrated_main"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2018-07-16 18:17:53 +00:00
|
|
|
begin_test "migrate import (dirty copy, negative answer)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_dirty_copy
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
original_main="$(git rev-parse main)"
|
2018-07-16 18:17:53 +00:00
|
|
|
|
|
|
|
|
echo "n" | git lfs migrate import --everything 2>&1 | tee migrate.log
|
|
|
|
|
grep "migrate: working copy must not be dirty" migrate.log
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
migrated_main="$(git rev-parse main)"
|
2018-07-16 18:17:53 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_ref_unmoved "main" "$original_main" "$migrated_main"
|
2018-07-16 18:17:53 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
|
|
|
|
begin_test "migrate import (dirty copy, unknown then negative answer)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_dirty_copy
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
original_main="$(git rev-parse main)"
|
2018-07-16 18:17:53 +00:00
|
|
|
|
|
|
|
|
echo "x\nn" | git lfs migrate import --everything 2>&1 | tee migrate.log
|
|
|
|
|
|
|
|
|
|
cat migrate.log
|
|
|
|
|
|
|
|
|
|
[ "2" -eq "$(grep -o "override changes in your working copy" migrate.log \
|
|
|
|
|
| wc -l | awk '{ print $1 }')" ]
|
|
|
|
|
grep "migrate: working copy must not be dirty" migrate.log
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
migrated_main="$(git rev-parse main)"
|
2018-07-16 18:17:53 +00:00
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_ref_unmoved "main" "$original_main" "$migrated_main"
|
2018-07-16 18:17:53 +00:00
|
|
|
)
|
|
|
|
|
end_test
|
2018-07-16 21:53:47 +00:00
|
|
|
|
|
|
|
|
begin_test "migrate import (dirty copy, positive answer)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_dirty_copy
|
|
|
|
|
|
|
|
|
|
oid="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
|
|
|
|
|
echo "y" | git lfs migrate import --everything 2>&1 | tee migrate.log
|
|
|
|
|
grep "migrate: changes in your working copy will be overridden ..." \
|
|
|
|
|
migrate.log
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.txt" "$oid" "5"
|
2018-07-16 21:53:47 +00:00
|
|
|
assert_local_object "$oid" "5"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2018-07-23 14:14:29 +00:00
|
|
|
|
2018-07-16 22:08:24 +00:00
|
|
|
begin_test "migrate import (non-standard refs)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_multiple_local_branches_non_standard
|
|
|
|
|
|
|
|
|
|
md_oid="$(calc_oid "$(git cat-file -p :a.md)")"
|
|
|
|
|
txt_oid="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
md_feature_oid="$(calc_oid "$(git cat-file -p my-feature:a.md)")"
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --everything
|
|
|
|
|
|
2020-06-29 16:18:57 +00:00
|
|
|
assert_pointer "refs/heads/main" "a.md" "$md_oid" "140"
|
|
|
|
|
assert_pointer "refs/heads/main" "a.txt" "$txt_oid" "120"
|
2018-07-16 22:08:24 +00:00
|
|
|
assert_pointer "refs/pull/1/base" "a.md" "$md_oid" "140"
|
|
|
|
|
assert_pointer "refs/pull/1/base" "a.txt" "$txt_oid" "120"
|
|
|
|
|
|
|
|
|
|
assert_pointer "refs/heads/my-feature" "a.txt" "$txt_oid" "120"
|
|
|
|
|
assert_pointer "refs/pull/1/head" "a.txt" "$txt_oid" "120"
|
|
|
|
|
|
|
|
|
|
assert_local_object "$md_oid" "140"
|
|
|
|
|
assert_local_object "$txt_oid" "120"
|
|
|
|
|
assert_local_object "$md_feature_oid" "30"
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2021-09-22 16:31:20 +00:00
|
|
|
|
|
|
|
|
begin_test "migrate import (copied file)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_copied_file
|
|
|
|
|
|
|
|
|
|
git lfs migrate import --above=1b
|
|
|
|
|
|
|
|
|
|
# Expect attributes for "/dir/a" and "/a"
|
|
|
|
|
if ! grep -q "^/dir/a.txt" ./.gitattributes || ! grep -q "^/a.txt" ./.gitattributes; then
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
)
|
|
|
|
|
end_test
|
2021-10-13 18:49:40 +00:00
|
|
|
|
git/githistory: cache files based on full path
When we cache files, do so on the full path instead of just the
directory entry. This means that when we have an identical file with
the same name in two different direectories, we distinguish between the
two paths and ensure both are added to .gitattributes.
This is an alternate solution to #4671 which should perform better. For
compmarison, with a clone of Git's main repository with the following
command, we get:
git lfs migrate import --everything --include="*.h":
* v3.0.1 (broken): 608s user, 53s system, 5:34 total
* v3.0.2 (fixed): 13435s user, 1255s system, 1:43:17 total
* this commit (fixed): 716s user, 67s system, 6:59 total
This is a much better performance characteristic for equivalent results.
Preserve the integration from the earlier attempt at fixing this plus
add an additional one. Avoid using assert_pointer in the new test
because that helper doesn't always work correctly when there are two
files with the same file name.
2022-01-12 18:18:33 +00:00
|
|
|
begin_test "migrate import (copied file with only a single path)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
setup_local_branch_with_copied_file
|
|
|
|
|
|
|
|
|
|
oid="$(calc_oid "$(git cat-file -p :a.txt)")"
|
|
|
|
|
|
|
|
|
|
# Prevent MSYS from rewriting /a.txt into a Windows path.
|
|
|
|
|
MSYS_NO_PATHCONV=1 git lfs migrate import --include="/a.txt" --everything
|
|
|
|
|
|
|
|
|
|
# Expect attribute for only "/a.txt".
|
|
|
|
|
if grep -q "^/dir/a.txt" ./.gitattributes || ! grep -q "^/a.txt" ./.gitattributes; then
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
refute_pointer "refs/heads/main" "dir/a.txt" "$oid" 5
|
|
|
|
|
)
|
|
|
|
|
end_test
|
|
|
|
|
|
2021-10-13 18:49:40 +00:00
|
|
|
begin_test "migrate import (filename special characters)"
|
|
|
|
|
(
|
|
|
|
|
set -e
|
|
|
|
|
setup_local_branch_with_special_character_files
|
|
|
|
|
git lfs migrate import --above=1b
|
|
|
|
|
# Windows does not allow creation of files with '*', so expect 2 files, not 3
|
|
|
|
|
if [ "$IS_WINDOWS" -eq "1" ] ; then
|
|
|
|
|
test "$(git check-attr filter -- *.bin |grep lfs | wc -l)" -eq 2 || exit 1
|
|
|
|
|
else
|
|
|
|
|
test "$(git check-attr filter -- *.bin |grep lfs | wc -l)" -eq 3 || exit 1
|
|
|
|
|
fi
|
|
|
|
|
)
|
|
|
|
|
end_test
|
