mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-06-27 00:51:18 +02:00
fix bug which prevented quitting with confirm
This commit is contained in:
@ -327,5 +327,9 @@ func (gui *Gui) surfaceError(err error) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err == gocui.ErrQuit {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return gui.createErrorPanel(err.Error())
|
return gui.createErrorPanel(err.Error())
|
||||||
}
|
}
|
||||||
|
2
test/integration/confirmQuit/config/config.yml
Normal file
2
test/integration/confirmQuit/config/config.yml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
disableStartupPopups: true
|
||||||
|
confirmOnQuit: true
|
@ -0,0 +1 @@
|
|||||||
|
myfile1
|
1
test/integration/confirmQuit/expected/.git_keep/HEAD
Normal file
1
test/integration/confirmQuit/expected/.git_keep/HEAD
Normal file
@ -0,0 +1 @@
|
|||||||
|
ref: refs/heads/master
|
10
test/integration/confirmQuit/expected/.git_keep/config
Normal file
10
test/integration/confirmQuit/expected/.git_keep/config
Normal 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
|
@ -0,0 +1 @@
|
|||||||
|
Unnamed repository; edit this file 'description' to name the repository.
|
BIN
test/integration/confirmQuit/expected/.git_keep/index
Normal file
BIN
test/integration/confirmQuit/expected/.git_keep/index
Normal file
Binary file not shown.
@ -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
|
@ -0,0 +1 @@
|
|||||||
|
0000000000000000000000000000000000000000 544efed4e669ec3bd64b44799175bffac95035f5 CI <CI@example.com> 1642239015 +1100 commit (initial): myfile1
|
@ -0,0 +1 @@
|
|||||||
|
0000000000000000000000000000000000000000 544efed4e669ec3bd64b44799175bffac95035f5 CI <CI@example.com> 1642239015 +1100 commit (initial): myfile1
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@
|
|||||||
|
544efed4e669ec3bd64b44799175bffac95035f5
|
1
test/integration/confirmQuit/expected/myfile1
Normal file
1
test/integration/confirmQuit/expected/myfile1
Normal file
@ -0,0 +1 @@
|
|||||||
|
test1
|
1
test/integration/confirmQuit/recording.json
Normal file
1
test/integration/confirmQuit/recording.json
Normal 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
12
test/integration/confirmQuit/setup.sh
Normal 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
4
test/integration/confirmQuit/test.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"description": "quit with a confirm",
|
||||||
|
"speed": 20
|
||||||
|
}
|
Reference in New Issue
Block a user