Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ func Reset(repoPath, rev string, opts ...ResetOptions) error {
cmd.AddArgs("--hard")
}

_, err := cmd.AddOptions(opt.CommandOptions).AddArgs("--end-of-options", rev).RunInDir(repoPath)
_, err := cmd.AddOptions(opt.CommandOptions).AddArgs(rev).RunInDir(repoPath)
return err
}

Expand Down
33 changes: 33 additions & 0 deletions repo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestRepository(t *testing.T) {
Expand Down Expand Up @@ -255,6 +256,38 @@ func TestRepository_Checkout(t *testing.T) {
}
}

func TestReset(t *testing.T) {
tests := []struct {
name string
rev string
opt ResetOptions
}{
{
name: "soft reset",
rev: "978fb7f6388b49b532fbef8b856681cfa6fcaa0a",
},
{
name: "hard reset",
rev: "978fb7f6388b49b532fbef8b856681cfa6fcaa0a",
opt: ResetOptions{
Hard: true,
},
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
path := tempPath()
defer func() { _ = os.RemoveAll(path) }()

err := Clone(testrepo.Path(), path)
require.NoError(t, err)

err = Reset(path, test.rev, test.opt)
assert.NoError(t, err)
})
}
}

func TestRepository_Reset(t *testing.T) {
r, cleanup, err := setupTempRepo()
if err != nil {
Expand Down
Loading