sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
Code Activity

fix: use message in git stash command

Browse Source
This commit is contained in:
Andrew Hynes
2022-06-21 18:23:23 -02:30
parent e66b162726
commit 6feb301c2a
16 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git_commands/stash.go
View File

@ -111,6 +111,6 @@ func (self *StashCommands) SaveStagedChanges(message string) error {
}
func (self *StashCommands) StashUntrackedChanges(message string) error {
return self.cmd.New("git stash --include-untracked").Run();
return self.cmd.New(fmt.Sprintf("git stash save %s --include-untracked", self.cmd.Quote(message))).Run()
}

2
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/ORIG_HEAD
View File

@ -1 +1 @@
592d439043d07cd223cbde4b3a0884b94634437b
03158a5be423590fa91f97c23ed505745e8e8aff

4
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/HEAD
View File

@ -1,2 +1,2 @@
0000000000000000000000000000000000000000 592d439043d07cd223cbde4b3a0884b94634437b CI <CI@example.com> 1654284027 -0230 commit (initial): Initial commit
592d439043d07cd223cbde4b3a0884b94634437b 592d439043d07cd223cbde4b3a0884b94634437b CI <CI@example.com> 1654284036 -0230 reset: moving to HEAD
0000000000000000000000000000000000000000 03158a5be423590fa91f97c23ed505745e8e8aff CI <CI@example.com> 1655844652 -0230 commit (initial): Initial commit
03158a5be423590fa91f97c23ed505745e8e8aff 03158a5be423590fa91f97c23ed505745e8e8aff CI <CI@example.com> 1655844659 -0230 reset: moving to HEAD

2
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/heads/master
View File

@ -1 +1 @@
0000000000000000000000000000000000000000 592d439043d07cd223cbde4b3a0884b94634437b CI <CI@example.com> 1654284027 -0230 commit (initial): Initial commit
0000000000000000000000000000000000000000 03158a5be423590fa91f97c23ed505745e8e8aff CI <CI@example.com> 1655844652 -0230 commit (initial): Initial commit

2
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/logs/refs/stash
View File

@ -1 +1 @@
0000000000000000000000000000000000000000 b3c24805b28fa5e90b5807bb402b123974f13d61 CI <CI@example.com> 1654284036 -0230 WIP on master: 592d439 Initial commit
0000000000000000000000000000000000000000 fed8896ec3398ae58cfd81e56a058bf18b49427a CI <CI@example.com> 1655844659 -0230 WIP on master: 03158a5 Initial commit

2
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/02/8cf118f08271dc2b9dd68d72a65918df664951
View File

@ -1,2 +0,0 @@
x<01><>[
<EFBFBD>0E<><45>*fJ&<26>&""<22><><EFBFBD>H<EFBFBD>S 6<><36>)<29>| n<><6E><EFBFBD>9<EFBFBD>R-%7@<40>Ome:ץQoX<6F>d<10>Gt!("<22>d;<3B>nqoϺB?<3F><><1E><><EFBFBD>=<3D><>j<EFBFBD>:k<>7R;8K<38><4B>8<EFBFBD><38><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ؗ<EFBFBD>Fz<46>S<>y<EFBFBD><79>@<40><><EFBFBD>_<EFBFBD>5`Xr<58>q<EFBFBD>_Z|j<>:<3A>

BIN
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/03/158a5be423590fa91f97c23ed505745e8e8aff Normal file
View File

Binary file not shown.

2
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/29/b079ba8e40edf7b2c76613e0a3de5b1b26ce70 Normal file
View File

@ -0,0 +1,2 @@
x<01><>A
<EFBFBD>0E]<5D>s%Mg<4D>DD<44><44>z<EFBFBD>I:<3A>BӔ<1A>Ƿ <20><>><3E><><EFBFBD>Xr<58>*cOu <0C><>-<2D><18><04><>j! ɍ<><1B>RA<>Q<EFBFBD><51><EFBFBD>RA<52>

BIN
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/59/2d439043d07cd223cbde4b3a0884b94634437b
View File

Binary file not shown.

BIN
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/b3/c24805b28fa5e90b5807bb402b123974f13d61
View File

Binary file not shown.

BIN
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/db/0f86d5434dd5e5f3a2210f9a7edf5a816ae935
View File

Binary file not shown.

2
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/fe/d8896ec3398ae58cfd81e56a058bf18b49427a Normal file
View File

@ -0,0 +1,2 @@
x<01><><EFBFBD>J1D=<3D>W<EFBFBD><07>Nҝ<4E>ED<45><44>ܼy<DCBC>N:<3A><>3<EFBFBD><33><11>|d<>^<5E>WE<57><45>-<2D>u<EFBFBD><75><EFBFBD>a<EFBFBD>f<0E>j5a<35><61>LY <20>j/-q(<28><>2<>t<EFBFBD><74><EFBFBD><EFBFBD> z*Bj"1ta<74>9<EFBFBD><10>PF<50>bEz?<3F><>
<EFBFBD>U<EFBFBD>!X<>YC<59>)<29>h <20><19>א<EFBFBD>e8<65><38><1B>x<EFBFBD>:@<40><>K@<40>Rͳ<52><CDB3><EFBFBD><EFBFBD><EFBFBD><05>I<EFBFBD><49>綻<EFBFBD><E7B6BB>^.<2E><><EFBFBD><EFBFBD>r<EFBFBD><72>SݖW<DD96><57><EFBFBD>@L<><4C>B<><42>H<0F>a<EFBFBD>ħ<EFBFBD><C4A7><EFBFBD>m<EFBFBD>[<5B><><EFBFBD><<3C><>n^<5E><>*7<>7<EFBFBD> <0B><>`

BIN
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/objects/ff/d4134b8bf80d379824558ce19b4eddbc53e2ba Normal file
View File

Binary file not shown.

2
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/refs/heads/master
View File

@ -1 +1 @@
592d439043d07cd223cbde4b3a0884b94634437b
03158a5be423590fa91f97c23ed505745e8e8aff

2
test/integration/stashIncludeUntrackedChanges/expected/repo/.git_keep/refs/stash
View File

@ -1 +1 @@
b3c24805b28fa5e90b5807bb402b123974f13d61
fed8896ec3398ae58cfd81e56a058bf18b49427a

2
test/integration/stashIncludeUntrackedChanges/recording.json
View File

@ -1 +1 @@
{"KeyEvents":[{"Timestamp":3590,"Mod":0,"Key":256,"Ch":83},{"Timestamp":6045,"Mod":0,"Key":256,"Ch":85},{"Timestamp":7792,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15045,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":294,"Height":79}]}
{"KeyEvents":[{"Timestamp":2942,"Mod":0,"Key":256,"Ch":83},{"Timestamp":4657,"Mod":0,"Key":256,"Ch":85},{"Timestamp":6393,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12342,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":294,"Height":79}]}