diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2019-04-02 19:53:16 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-05-06 22:44:38 +1000 |
commit | 5a0d0bb299eb2e4d693d3ecab506cc154e97678a (patch) | |
tree | 8c916afb93e7b5cae75b56c3c1431efa452dc29f /pkg/commands/git_test.go | |
parent | 2746b1bd38fa2668490a8db2369dec5146fbaec6 (diff) |
support resetting to a commit in either soft, hard, or mixed mode
Diffstat (limited to 'pkg/commands/git_test.go')
-rw-r--r-- | pkg/commands/git_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/commands/git_test.go b/pkg/commands/git_test.go index 3358be054..0d59c30b7 100644 --- a/pkg/commands/git_test.go +++ b/pkg/commands/git_test.go @@ -616,12 +616,12 @@ func TestGitCommandResetToCommit(t *testing.T) { gitCmd := NewDummyGitCommand() gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd { assert.EqualValues(t, "git", cmd) - assert.EqualValues(t, []string{"reset", "78976bc"}, args) + assert.EqualValues(t, []string{"reset", "--hard", "78976bc"}, args) return exec.Command("echo") } - assert.NoError(t, gitCmd.ResetToCommit("78976bc")) + assert.NoError(t, gitCmd.ResetToCommit("78976bc", "hard")) } // TestGitCommandNewBranch is a function. |