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

Discard staged changes only

Browse Source
This commit is contained in:
Luka Markušić
2022-05-08 13:30:43 +02:00
parent f7c44f2407
commit ca191159f5
36 changed files with 102 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,10 @@ func NewStashCommands(
}
}
func (self *StashCommands) DropNewest() error {
return self.cmd.New("git stash drop").Run()
}
func (self *StashCommands) Drop(index int) error {
return self.cmd.New(fmt.Sprintf("git stash drop stash@{%d}", index)).Run()
}

24
pkg/gui/controllers/workspace_reset_controller.go
View File

@ -12,7 +12,7 @@ import (
func (self *FilesController) createResetMenu() error {
red := style.FgRed
nukeStr := "reset --hard HEAD && git clean -fd"
nukeStr := "git reset --hard HEAD && git clean -fd"
if len(self.model.Submodules) > 0 {
nukeStr = fmt.Sprintf("%s (%s)", nukeStr, self.c.Tr.LcAndResetSubmodules)
}
@ -64,6 +64,28 @@ func (self *FilesController) createResetMenu() error {
},
Key: 'c',
},
{
LabelColumns: []string{
self.c.Tr.LcDiscardStagedChanges,
red.Sprint("stash staged and drop stash"),
},
Tooltip: "This will create a new stash entry containing only staged files and then drop it.",
OnPress: func() error {
self.c.LogAction(self.c.Tr.Actions.RemoveStagedFiles)
if !self.helpers.WorkingTree.IsWorkingTreeDirty() {
return self.c.ErrorMsg(self.c.Tr.NoTrackedStagedFilesStash)
}
if err := self.git.Stash.SaveStagedChanges("[lazygit] tmp stash"); err != nil {
return self.c.Error(err)
}
if err := self.git.Stash.DropNewest(); err != nil {
return self.c.Error(err)
}
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}})
},
Key: 'S',
},
{
LabelColumns: []string{
self.c.Tr.LcSoftReset,

4
pkg/i18n/english.go
View File

@ -265,6 +265,7 @@ type TranslationSet struct {
LcDiscardAllChangesToAllFiles string
LcDiscardAnyUnstagedChanges string
LcDiscardUntrackedFiles string
LcDiscardStagedChanges string
LcHardReset string
LcViewResetOptions string
LcCreateFixupCommit string
@ -594,6 +595,7 @@ type Actions struct {
NukeWorkingTree string
DiscardUnstagedFileChanges string
RemoveUntrackedFiles string
RemoveStagedFiles string
SoftReset string
MixedReset string
HardReset string
@ -883,6 +885,7 @@ func EnglishTranslationSet() TranslationSet {
LcDiscardAllChangesToAllFiles: "nuke working tree",
LcDiscardAnyUnstagedChanges: "discard unstaged changes",
LcDiscardUntrackedFiles: "discard untracked files",
LcDiscardStagedChanges: "discard staged changes",
LcHardReset: "hard reset",
LcViewResetOptions: `view reset options`,
LcCreateFixupCommit: `create fixup commit for this commit`,
@ -1193,6 +1196,7 @@ func EnglishTranslationSet() TranslationSet {
NukeWorkingTree: "Nuke working tree",
DiscardUnstagedFileChanges: "Discard unstaged file changes",
RemoveUntrackedFiles: "Remove untracked files",
RemoveStagedFiles: "Remove staged files",
SoftReset: "Soft reset",
MixedReset: "Mixed reset",
HardReset: "Hard reset",

1
test/integration/discardStagedFiles/expected/repo/.git_keep/COMMIT_EDITMSG Normal file
View File

@ -0,0 +1 @@
file2

0
test/integration/discardStagedFiles/expected/repo/.git_keep/FETCH_HEAD Normal file
View File

1
test/integration/discardStagedFiles/expected/repo/.git_keep/HEAD Normal file
View File

@ -0,0 +1 @@
ref: refs/heads/master

1
test/integration/discardStagedFiles/expected/repo/.git_keep/ORIG_HEAD Normal file
View File

@ -0,0 +1 @@
02f629e46dbaa03b58196cced3df07b02c0daf22

8
test/integration/discardStagedFiles/expected/repo/.git_keep/config Normal file
View File

@ -0,0 +1,8 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[user]
email = CI@example.com
name = CI

1
test/integration/discardStagedFiles/expected/repo/.git_keep/description Normal file
View File

@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/index Normal file
View File

Binary file not shown.

6
test/integration/discardStagedFiles/expected/repo/.git_keep/info/exclude Normal file
View File

@ -0,0 +1,6 @@
# git ls-files --others --exclude-from=.git/info/exclude
# Lines that start with '#' are comments.
# For a project mostly in C, the following would be a good set of
# exclude patterns (uncomment them if you want to use them):
# *.[oa]
# *~

5
test/integration/discardStagedFiles/expected/repo/.git_keep/logs/HEAD Normal file
View File

@ -0,0 +1,5 @@
0000000000000000000000000000000000000000 22f24c5fcc97c1ff826ecb66b60bdc01937f6052 CI <CI@example.com> 1652009263 +0200 commit (initial): file0
22f24c5fcc97c1ff826ecb66b60bdc01937f6052 9e7ff93a5c67a0ef098e9e436961746f333edf98 CI <CI@example.com> 1652009263 +0200 commit: file1
9e7ff93a5c67a0ef098e9e436961746f333edf98 02f629e46dbaa03b58196cced3df07b02c0daf22 CI <CI@example.com> 1652009263 +0200 commit: file2
02f629e46dbaa03b58196cced3df07b02c0daf22 02f629e46dbaa03b58196cced3df07b02c0daf22 CI <CI@example.com> 1652009266 +0200 reset: moving to HEAD
02f629e46dbaa03b58196cced3df07b02c0daf22 02f629e46dbaa03b58196cced3df07b02c0daf22 CI <CI@example.com> 1652009266 +0200 reset: moving to HEAD

3
test/integration/discardStagedFiles/expected/repo/.git_keep/logs/refs/heads/master Normal file
View File

@ -0,0 +1,3 @@
0000000000000000000000000000000000000000 22f24c5fcc97c1ff826ecb66b60bdc01937f6052 CI <CI@example.com> 1652009263 +0200 commit (initial): file0
22f24c5fcc97c1ff826ecb66b60bdc01937f6052 9e7ff93a5c67a0ef098e9e436961746f333edf98 CI <CI@example.com> 1652009263 +0200 commit: file1
9e7ff93a5c67a0ef098e9e436961746f333edf98 02f629e46dbaa03b58196cced3df07b02c0daf22 CI <CI@example.com> 1652009263 +0200 commit: file2

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/02/f629e46dbaa03b58196cced3df07b02c0daf22 Normal file
View File

Binary file not shown.

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 Normal file
View File

Binary file not shown.

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 Normal file
View File

Binary file not shown.

3
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/22/f24c5fcc97c1ff826ecb66b60bdc01937f6052 Normal file
View File

@ -0,0 +1,3 @@
x<01><><EFBFBD>
<EFBFBD>0=<3D>+<2B>.<2E>&ݦ.<2E>=<3D>3<EFBFBD><33>
)%<25><>o><3E><>0 <0C>ZK<5A>Y<>K;<01>২<>)<29>q<EFBFBD>!Y<><59>1KfSv

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da Normal file
View File

Binary file not shown.

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 Normal file
View File

Binary file not shown.

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/5e/2f5743436bdc7602aa3486d5ff294940603c3d Normal file
View File

Binary file not shown.

3
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 Normal file
View File

@ -0,0 +1,3 @@
x+)JMU<4D><55>d040031QH<51><48>I5`<60><10><><EFBFBD><EFBFBD><EFBFBD>ֶw<D6B6><77><EFBFBD>w.<2E><>h<EFBFBD>T<EFBFBD>[H
<19><1F>e<EFBFBD><65>"Ǩ<>S<EFBFBD>,<2C><>gu"<22><>YH
<EFBFBD>$x~5(<28>;<3B>rբ<72><D5A2><EFBFBD><EFBFBD>W<EFBFBD><57>-<2D>Ж+^

2
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9d/b161bba78fbd20e7e4ae004be28e40d747726a Normal file
View File

@ -0,0 +1,2 @@
x<01><><EFBFBD>
<EFBFBD>0D=<3D>+<2B>.<2E>v<EFBFBD>n<<3C>3<EFBFBD><33> <0B>-5<><35>o.޽

2
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9e/7ff93a5c67a0ef098e9e436961746f333edf98 Normal file
View File

@ -0,0 +1,2 @@
x<01><>A
<EFBFBD>0E]<5D><14> 2<>$"BW=F2<46><32><EFBFBD><EFBFBD><EFBFBD>D<EFBFBD><44><EFBFBD><08>><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>K<EFBFBD>.<2E><>"<22>A"<22><> <0C>p)<29><i<>Tr<54><72>=Pȁ<50>3{9<><39>-<2D>bਣI<E0A8A3>T<EFBFBD>H•<48><12><><EFBFBD><EFBFBD>OJєOn<7F><6E>f{<7B><><EFBFBD>|˺<><CBBA><EFBFBD><EFBFBD>z<EFBFBD><7A>"d$o<>0<EFBFBD>t<><74><EFBFBD><EFBFBD>nty<74>3?<3F><>9<EFBFBD>

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c Normal file
View File

Binary file not shown.

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 Normal file
View File

Binary file not shown.

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a Normal file
View File

Binary file not shown.

2
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 Normal file
View File

@ -0,0 +1,2 @@
x+)JMU03c040031QH<51><48>I5`<60><10><><EFBFBD><EFBFBD><EFBFBD>ֶw<D6B6><77><EFBFBD>w.<2E><>h<EFBFBD>T<EFBFBD>[H
<19><>y<EFBFBD>W5<57>Ɨ<EFBFBD><C697>(<28>|<7C> ^-<2D>W(x9

BIN
test/integration/discardStagedFiles/expected/repo/.git_keep/objects/e3/18207cf3da045ce47e2632a5326b61030a2c8e Normal file
View File

Binary file not shown.

1
test/integration/discardStagedFiles/expected/repo/.git_keep/refs/heads/master Normal file
View File

@ -0,0 +1 @@
02f629e46dbaa03b58196cced3df07b02c0daf22

1
test/integration/discardStagedFiles/expected/repo/file0 Normal file
View File

@ -0,0 +1 @@
test0

1
test/integration/discardStagedFiles/expected/repo/file1 Normal file
View File

@ -0,0 +1 @@
test1

1
test/integration/discardStagedFiles/expected/repo/file2 Normal file
View File

@ -0,0 +1 @@
hello there

1
test/integration/discardStagedFiles/expected/repo/file3 Normal file
View File

@ -0,0 +1 @@
hello there

1
test/integration/discardStagedFiles/recording.json Normal file
View File

@ -0,0 +1 @@
{"KeyEvents":[{"Timestamp":1175,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1991,"Mod":0,"Key":256,"Ch":68},{"Timestamp":2923,"Mod":0,"Key":256,"Ch":83},{"Timestamp":4453,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":213,"Height":56}]}

26
test/integration/discardStagedFiles/setup.sh Normal file
View File

@ -0,0 +1,26 @@
#!/bin/sh
set -e
cd $1
git init
git config user.email "CI@example.com"
git config user.name "CI"
echo test0 > file0
git add .
git commit -am file0
echo test1 > file1
git add .
git commit -am file1
echo test2 > file2
git add .
git commit -am file2
echo "hello there" > file1
echo "hello there" > file2
echo "hello there" > file3

1
test/integration/discardStagedFiles/test.json Normal file
View File

@ -0,0 +1 @@
{ "description": "Discarding staged changes", "speed": 5 }