lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4771 from bk2204/migrate-import-patterns-above

Browse Source 
migrate import: don't allow path filters with --above
This commit is contained in:
brian m. carlson 2021-12-09 14:43:05 +00:00 committed by GitHub
commit a92d101fe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
commands/command_migrate_import.go
View File

@ -18,6 +18,7 @@ import (
"github.com/git-lfs/git-lfs/v3/tasklog" "github.com/git-lfs/git-lfs/v3/tasklog"
"github.com/git-lfs/git-lfs/v3/tools" "github.com/git-lfs/git-lfs/v3/tools"
"github.com/git-lfs/git-lfs/v3/tools/humanize" "github.com/git-lfs/git-lfs/v3/tools/humanize"
"github.com/git-lfs/git-lfs/v3/tr"
"github.com/git-lfs/gitobj/v2" "github.com/git-lfs/gitobj/v2"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -138,6 +139,12 @@ func migrateImportCommand(cmd *cobra.Command, args []string) {
if err != nil { if err != nil {
ExitWithError(errors.Wrap(err, "fatal: cannot parse --above=<n>")) ExitWithError(errors.Wrap(err, "fatal: cannot parse --above=<n>"))
} }
if above > 0 {
include, exclude := getIncludeExcludeArgs(cmd)
if include != nil || exclude != nil || migrateFixup {
ExitWithError(errors.Errorf(tr.Tr.Get("fatal: cannot use --above with --include, --exclude, --fixup")))
}
}
blobCache := make(map[string]bytes.Buffer) blobCache := make(map[string]bytes.Buffer)

3
docs/man/git-lfs-migrate.1.ronn
View File

@ -232,7 +232,8 @@ options and these additional ones:
* `--above=<size>` * `--above=<size>`
Only migrate files whose individual filesize is above the given size. `size` Only migrate files whose individual filesize is above the given size. `size`
may be specified as a number of bytes, or a number followed by a storage may be specified as a number of bytes, or a number followed by a storage
unit, e.g., "1b", "20 MB", "3 TiB", etc. unit, e.g., "1b", "20 MB", "3 TiB", etc. This option cannot be used with
the `--include`, `--exclude`, and `--fixup` options.
* `--object-map=<path>` * `--object-map=<path>`
Write to `path` a file with the mapping of each rewritten commits. The file Write to `path` a file with the mapping of each rewritten commits. The file

16
t/t-migrate-import.sh
View File

@ -487,6 +487,22 @@ begin_test "migrate import (above with multiple files)"
) )
end_test end_test
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
begin_test "migrate import (existing .gitattributes)" begin_test "migrate import (existing .gitattributes)"
( (
set -e set -e