go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-03 13:21:56 +02:00
Code Issues Releases Activity

fix bug which prevented quitting with confirm

Browse Source
This commit is contained in:
Jesse Duffield 2022-01-15 20:30:34 +11:00
parent 7a690f9078
commit befa35645e
19 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/confirmation_panel.go
View File

@ -327,5 +327,9 @@ func (gui *Gui) surfaceError(err error) error {
return nil
}
if err == gocui.ErrQuit {
return err
}
return gui.createErrorPanel(err.Error())
}

2
test/integration/confirmQuit/config/config.yml Normal file
View File

@ -0,0 +1,2 @@
disableStartupPopups: true
confirmOnQuit: true

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

@ -0,0 +1 @@
myfile1

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

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

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

10
test/integration/confirmQuit/expected/.git_keep/config Normal file
View File

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

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

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

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

Binary file not shown.

7
test/integration/confirmQuit/expected/.git_keep/info/exclude Normal file
View File

@ -0,0 +1,7 @@
# 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]
# *~
.DS_Store

1
test/integration/confirmQuit/expected/.git_keep/logs/HEAD Normal file
View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000 544efed4e669ec3bd64b44799175bffac95035f5 CI <CI@example.com> 1642239015 +1100 commit (initial): myfile1

1
test/integration/confirmQuit/expected/.git_keep/logs/refs/heads/master Normal file
View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000 544efed4e669ec3bd64b44799175bffac95035f5 CI <CI@example.com> 1642239015 +1100 commit (initial): myfile1

BIN
test/integration/confirmQuit/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 Normal file
View File

Binary file not shown.

BIN
test/integration/confirmQuit/expected/.git_keep/objects/54/4efed4e669ec3bd64b44799175bffac95035f5 Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

@ -0,0 +1 @@
544efed4e669ec3bd64b44799175bffac95035f5

1
test/integration/confirmQuit/expected/myfile1 Normal file
View File

@ -0,0 +1 @@
test1

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

@ -0,0 +1 @@
{"KeyEvents":[{"Timestamp":466,"Mod":0,"Key":256,"Ch":113},{"Timestamp":890,"Mod":0,"Key":13,"Ch":13}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

12
test/integration/confirmQuit/setup.sh Normal file
View File

@ -0,0 +1,12 @@
#!/bin/sh
cd $1
git init
git config user.email "CI@example.com"
git config user.name "CI"
echo test1 > myfile1
git add .
git commit -am "myfile1"

4
test/integration/confirmQuit/test.json Normal file
View File

@ -0,0 +1,4 @@
{
"description": "quit with a confirm",
"speed": 20
}