mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-04 10:34:55 +02:00
63dc07fded
By constructing an arg vector manually, we no longer need to quote arguments Mandate that args must be passed when building a command Now you need to provide an args array when building a command. There are a handful of places where we need to deal with a string, such as with user-defined custom commands, and for those we now require that at the callsite they use str.ToArgv to do that. I don't want to provide a method out of the box for it because I want to discourage its use. For some reason we were invoking a command through a shell when amending a commit, and I don't believe we needed to do that as there was nothing user- supplied about the command. So I've switched to using a regular command out- side the shell there
33 lines
922 B
Go
33 lines
922 B
Go
package components
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
)
|
|
|
|
type Git struct {
|
|
*assertionHelper
|
|
shell *Shell
|
|
}
|
|
|
|
func (self *Git) CurrentBranchName(expectedName string) *Git {
|
|
return self.assert([]string{"git", "rev-parse", "--abbrev-ref", "HEAD"}, expectedName)
|
|
}
|
|
|
|
func (self *Git) TagNamesAt(ref string, expectedNames []string) *Git {
|
|
return self.assert([]string{"git", "tag", "--sort=v:refname", "--points-at", ref}, strings.Join(expectedNames, "\n"))
|
|
}
|
|
|
|
func (self *Git) assert(cmdArgs []string, expected string) *Git {
|
|
self.assertWithRetries(func() (bool, string) {
|
|
output, err := self.shell.runCommandWithOutput(cmdArgs)
|
|
if err != nil {
|
|
return false, fmt.Sprintf("Unexpected error running command: `%v`. Error: %s", cmdArgs, err.Error())
|
|
}
|
|
actual := strings.TrimSpace(output)
|
|
return actual == expected, fmt.Sprintf("Expected current branch name to be '%s', but got '%s'", expected, actual)
|
|
})
|
|
|
|
return self
|
|
}
|