CR Fixes 2

treeverse · Aug 3, 2023 · 1af5109 · 1af5109
1 parent 4cf07d5
commit 1af5109
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/cmd/lakectl/cmd/local_list.go b/cmd/lakectl/cmd/local_list.go
@@ -61,7 +61,7 @@ var localListCmd = &cobra.Command{
 				Headers: []interface{}{
 					"Directory",
 					"Remote URI",
-					"Last synced HEAD",
+					"Synced commit",
 				},
 				Rows: rows,
 			},

diff --git a/pkg/git/errors.go b/pkg/git/errors.go
@@ -5,7 +5,6 @@ import (
 )
 
 var (
-	ErrGitError       = errors.New("git error")
 	ErrNotARepository = errors.New("not a git repository")
 	ErrNoGit          = errors.New("no git support")
 )
diff --git a/pkg/git/git.go b/pkg/git/git.go
@@ -46,7 +46,7 @@ func GetRepositoryPath(dir string) (string, error) {
 	if strings.Contains(out, "not a git repository") {
 		return "", ErrNotARepository
 	}
-	return "", fmt.Errorf("%s: %w", out, ErrGitError)
+	return "", fmt.Errorf("%s: %w", out, err)
 }
 
 func createEntriesForIgnore(dir string, paths []string, exclude bool) ([]string, error) {

diff --git a/pkg/git/git_test.go b/pkg/git/git_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/treeverse/lakefs/pkg/git"
 )
 
-func TestIsGitRepository(t *testing.T) {
+func TestIsRepository(t *testing.T) {
 	tmpdir := t.TempDir()
 	tmpSubdir, err := os.MkdirTemp(tmpdir, "")
 	require.NoError(t, err)
@@ -35,7 +35,7 @@ func TestIsGitRepository(t *testing.T) {
 	require.True(t, git.IsRepository(tmpSubdir))
 }
 
-func TestGetGitRepositoryPath(t *testing.T) {
+func TestGetRepositoryPath(t *testing.T) {
 	tmpdir := t.TempDir()
 	tmpSubdir, err := os.MkdirTemp(tmpdir, "")
 	require.NoError(t, err)
@@ -50,15 +50,15 @@ func TestGetGitRepositoryPath(t *testing.T) {
 	_, err = git.GetRepositoryPath(tmpdir)
 	require.ErrorIs(t, err, git.ErrNotARepository)
 	_, err = git.GetRepositoryPath(tmpFile.Name())
-	require.ErrorIs(t, err, git.ErrGitError)
+	require.Error(t, err)
 
 	// Init git repo on root
 	require.NoError(t, exec.Command("git", "init", "-q", tmpdir).Run())
 	gitPath, err := git.GetRepositoryPath(tmpdir)
 	require.NoError(t, err)
 	require.Equal(t, tmpdir, gitPath)
 	_, err = git.GetRepositoryPath(tmpFile.Name())
-	require.ErrorIs(t, err, git.ErrGitError)
+	require.Error(t, err)
 	gitPath, err = git.GetRepositoryPath(tmpSubdir)
 	require.NoError(t, err)
 	require.Equal(t, tmpdir, gitPath)
@@ -85,7 +85,7 @@ func TestIgnore(t *testing.T) {
 	_, err = git.Ignore(tmpdir, []string{}, []string{}, marker)
 	require.ErrorIs(t, err, git.ErrNotARepository)
 	_, err = git.Ignore(tmpFile.Name(), []string{}, []string{}, marker)
-	require.ErrorIs(t, err, git.ErrGitError)
+	require.Error(t, err)
 
 	// Init git repo on tmpdir
 	require.NoError(t, exec.Command("git", "init", "-q", tmpdir).Run())
@@ -107,7 +107,7 @@ func TestIgnore(t *testing.T) {
 	verifyPathTracked(t, []string{filepath.Base(tmpSubdir), trackedFile})
 
 	_, err = git.Ignore(tmpFile.Name(), []string{}, []string{excludedPath}, marker)
-	require.ErrorIs(t, err, git.ErrGitError)
+	require.Error(t, err)
 	result, err := git.Ignore(tmpdir, []string{}, []string{excludedPath}, marker)
 	require.NoError(t, err)
 	require.Equal(t, ignorePath, result)

diff --git a/pkg/local/index.go b/pkg/local/index.go
@@ -73,9 +73,10 @@ func ReadIndex(path string) (*Index, error) {
 	if err != nil {
 		return nil, err
 	}
-	idx := &Index{}
+	idx := &Index{
+		root: filepath.Dir(idxPath),
+	}
 	err = yaml.Unmarshal(data, idx)
-	idx.root = filepath.Dir(idxPath)
 	if err != nil {
 		return nil, err
 	}