111

Author: unknwon

command.go

@@ -19,7 +19,6 @@ import (
 
 // CommandOptions contains additional options for running a Git command.
 type CommandOptions struct {
-	// The additional environment variables to be passed to the underlying Git.
 	Envs []string
 }
 

repo_blame.go

@@ -25,7 +25,6 @@ func (r *Repository) Blame(ctx context.Context, rev, file string, opts ...BlameO
 	}
 
 	args := []string{"blame", "-l", "-s", rev, "--", file}
-
 	stdout, err := exec(ctx, r.path, args, opt.Envs)
 	if err != nil {
 		return nil, err

repo_commit.go

@@ -95,7 +95,6 @@ func (r *Repository) CatFileCommit(ctx context.Context, rev string, opts ...CatF
 	}
 
 	args := []string{"cat-file", "commit", commitID}
-
 	stdout, err := exec(ctx, r.path, args, opt.Envs)
 	if err != nil {
 		return nil, err
@@ -128,7 +127,6 @@ func (r *Repository) CatFileType(ctx context.Context, rev string, opts ...CatFil
 	}
 
 	args := []string{"cat-file", "-t", rev}
-
 	typ, err := exec(ctx, r.path, args, opt.Envs)
 	if err != nil {
 		return "", err

repo_grep.go

@@ -79,7 +79,6 @@ func (r *Repository) Grep(ctx context.Context, pattern string, opts ...GrepOptio
 	}
 
 	args := []string{"grep"}
-	// Display full-name, line number and column number
 	args = append(args, "--full-name", "--line-number", "--column")
 	if opt.IgnoreCase {
 		args = append(args, "--ignore-case")

repo_pull.go

@@ -6,6 +6,7 @@ package git
 
 import (
 	"context"
+	"fmt"
 	"strings"
 )
 
@@ -25,11 +26,10 @@ func (r *Repository) MergeBase(ctx context.Context, base, head string, opts ...M
 		opt = opts[0]
 	}
 
-	args := []string{"merge-base"}
-	args = append(args, "--end-of-options", base, head)
-
+	args := []string{"merge-base", "--end-of-options", base, head}
 	stdout, err := exec(ctx, r.path, args, opt.Envs)
 	if err != nil {
+		fmt.Printf("%+v\n", err)
 		if isExitStatus(err, 1) {
 			return "", ErrNoMergeBase
 		}

repo_pull_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestRepository_MergeBase(t *testing.T) {
@@ -25,28 +26,25 @@ func TestRepository_MergeBase(t *testing.T) {
 	tests := []struct {
 		base         string
 		head         string
-		opt          MergeBaseOptions
-		expMergeBase string
+		opt           MergeBaseOptions
+		wantMergeBase string
 	}{
 		{
-			base:         "4e59b72440188e7c2578299fc28ea425fbe9aece",
-			head:         "0eedd79eba4394bbef888c804e899731644367fe",
-			expMergeBase: "4e59b72440188e7c2578299fc28ea425fbe9aece",
+			base:          "4e59b72440188e7c2578299fc28ea425fbe9aece",
+			head:          "0eedd79eba4394bbef888c804e899731644367fe",
+			wantMergeBase: "4e59b72440188e7c2578299fc28ea425fbe9aece",
 		},
 		{
-			base:         "master",
-			head:         "release-1.0",
-			expMergeBase: "0eedd79eba4394bbef888c804e899731644367fe",
+			base:          "master",
+			head:          "release-1.0",
+			wantMergeBase: "0eedd79eba4394bbef888c804e899731644367fe",
 		},
 	}
 	for _, test := range tests {
 		t.Run("", func(t *testing.T) {
 			mb, err := testrepo.MergeBase(ctx, test.base, test.head, test.opt)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			assert.Equal(t, test.expMergeBase, mb)
+			require.NoError(t, err)
+			assert.Equal(t, test.wantMergeBase, mb)
 		})
 	}
 }

tree_entry_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestTreeEntry(t *testing.T) {
@@ -31,6 +32,39 @@ func TestTreeEntry(t *testing.T) {
 	assert.Equal(t, "go.mod", e.Name())
 }
 
+func TestTreeEntry_Size(t *testing.T) {
+	ctx := context.Background()
+	tree, err := testrepo.LsTree(ctx, "0eedd79eba4394bbef888c804e899731644367fe")
+	require.NoError(t, err)
+
+	es, err := tree.Entries(ctx)
+	require.NoError(t, err)
+
+	t.Run("blob", func(t *testing.T) {
+		var entry *TreeEntry
+		for _, e := range es {
+			if e.Name() == "README.txt" {
+				entry = e
+				break
+			}
+		}
+		require.NotNil(t, entry, "entry README.txt not found")
+		assert.Equal(t, int64(795), entry.Size(ctx))
+	})
+
+	t.Run("tree returns zero", func(t *testing.T) {
+		var entry *TreeEntry
+		for _, e := range es {
+			if e.IsTree() {
+				entry = e
+				break
+			}
+		}
+		require.NotNil(t, entry, "tree entry not found")
+		assert.Equal(t, int64(0), entry.Size(ctx))
+	})
+}
+
 func TestEntries_Sort(t *testing.T) {
 	ctx := context.Background()
 	tree, err := testrepo.LsTree(ctx, "0eedd79eba4394bbef888c804e899731644367fe")