undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: return early when patch fails to apply

Browse Source 
In the procedure apply_or_revert_range_or_line, if the patch does not
apply successfully, a dialog is shown, but execution proceeds after
that. Instead, return early on error so the parts that come after this
don't work on top of an error state.

Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
This commit is contained in:
Pratyush Yadav 2019-08-26 04:23:13 +05:30
parent 62bd99934b
commit 2ccdfb1c78
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/diff.tcl
View File

@ -848,6 +848,8 @@ proc apply_or_revert_range_or_line {x y revert} {
puts -nonewline $p $wholepatch puts -nonewline $p $wholepatch
close $p} err]} { close $p} err]} {
error_popup "$failed_msg\n\n$err" error_popup "$failed_msg\n\n$err"
unlock_index
return
} }
unlock_index unlock_index