diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2023-07-01 16:18:38 +0200 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2023-07-10 15:09:17 +0200 |
| commit | 1827380c69f00288fe3c8e6dfb91775c6be4ffa9 (patch) | |
| tree | 22e5273837af7f60187b676f867daac275c413c9 /pkg | |
| parent | ea0baf58e6b4b819117a859e06e82c3cef1aaf0d (diff) | |
Fix git stash calls for older git versions
Older git versions are pickier about parameter order: for "store", the sha
argument must come last, and for "save", the message must come last.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/commands/git_commands/stash.go | 7 | ||||
| -rw-r--r-- | pkg/commands/git_commands/stash_test.go | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkg/commands/git_commands/stash.go b/pkg/commands/git_commands/stash.go index 86018fd8d..a9e2d67e5 100644 --- a/pkg/commands/git_commands/stash.go +++ b/pkg/commands/git_commands/stash.go @@ -63,8 +63,9 @@ func (self *StashCommands) Save(message string) error { func (self *StashCommands) Store(sha string, message string) error { trimmedMessage := strings.Trim(message, " \t") - cmdArgs := NewGitCmd("stash").Arg("store", sha). + cmdArgs := NewGitCmd("stash").Arg("store"). ArgIf(trimmedMessage != "", "-m", trimmedMessage). + Arg(sha). ToArgv() return self.cmd.New(cmdArgs).Run() @@ -93,7 +94,7 @@ func (self *StashCommands) ShowStashEntryCmdObj(index int, ignoreWhitespace bool } func (self *StashCommands) StashAndKeepIndex(message string) error { - cmdArgs := NewGitCmd("stash").Arg("save", message, "--keep-index"). + cmdArgs := NewGitCmd("stash").Arg("save", "--keep-index", message). ToArgv() return self.cmd.New(cmdArgs).Run() @@ -171,7 +172,7 @@ func (self *StashCommands) SaveStagedChanges(message string) error { func (self *StashCommands) StashIncludeUntrackedChanges(message string) error { return self.cmd.New( - NewGitCmd("stash").Arg("save", message, "--include-untracked"). + NewGitCmd("stash").Arg("save", "--include-untracked", message). ToArgv(), ).Run() } diff --git a/pkg/commands/git_commands/stash_test.go b/pkg/commands/git_commands/stash_test.go index d19c0a519..f1a151cd8 100644 --- a/pkg/commands/git_commands/stash_test.go +++ b/pkg/commands/git_commands/stash_test.go @@ -57,7 +57,7 @@ func TestStashStore(t *testing.T) { testName: "Non-empty message", sha: "0123456789abcdef", message: "New stash name", - expected: []string{"stash", "store", "0123456789abcdef", "-m", "New stash name"}, + expected: []string{"stash", "store", "-m", "New stash name", "0123456789abcdef"}, }, { testName: "Empty message", @@ -162,7 +162,7 @@ func TestStashRename(t *testing.T) { expectedShaCmd: []string{"rev-parse", "refs/stash@{3}"}, shaResult: "f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd\n", expectedDropCmd: []string{"stash", "drop", "stash@{3}"}, - expectedStoreCmd: []string{"stash", "store", "f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd", "-m", "New message"}, + expectedStoreCmd: []string{"stash", "store", "-m", "New message", "f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd"}, }, { testName: "Empty message", |