Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Import into new db format should succeed if repo not previously initalized #115

Merged
merged 2 commits into from
May 15, 2023
Merged

fix: Import into new db format should succeed if repo not previously initalized #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24f7032
fix: Import into new db format should succeed if repo not previously …
twavv May 15, 2023
041f88e
Merge branch 'master' into travis/mer-2302-fix-ref-metadata-import
aviator-app[bot] May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/meta/refmeta/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package refmeta

import (
"emperror.dev/errors"
"github.com/aviator-co/av/internal/git"
"github.com/aviator-co/av/internal/meta"
"github.com/aviator-co/av/internal/utils/cleanup"
Expand All @@ -14,7 +15,7 @@ func Import(repo *git.Repo, db meta.DB) error {
defer cu.Cleanup()

repoMeta, err := ReadRepository(repo)
if err != nil {
if err != nil && !errors.Is(err, ErrRepoNotInitialized) {
return err
}
tx.SetRepository(repoMeta)
Expand Down