go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

Merge branch 'master' into https-ask-for-username-password

Browse Source
This commit is contained in:
Mark Kopenga
2018-12-08 16:41:39 +01:00
committed by GitHub
parent 270658fc00 ff856b7630
commit 19a6a32625
22 changed files with 688 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/commands/git_test.go
View File

@ -557,8 +557,8 @@ func TestGitCommandMergeStatusFiles(t *testing.T) {
}
}
// TestGitCommandUpstreamDifferentCount is a function.
func TestGitCommandUpstreamDifferentCount(t *testing.T) {
// TestGitCommandGetCommitDifferences is a function.
func TestGitCommandGetCommitDifferences(t *testing.T) {
type scenario struct {
testName string
command func(string, ...string) *exec.Cmd
@ -610,7 +610,7 @@ func TestGitCommandUpstreamDifferentCount(t *testing.T) {
t.Run(s.testName, func(t *testing.T) {
gitCmd := newDummyGitCommand()
gitCmd.OSCommand.command = s.command
s.test(gitCmd.UpstreamDifferenceCount())
s.test(gitCmd.GetCommitDifferences("HEAD", "@{u}"))
})
}
}