git-gui: return early when patch fails to apply

prati0100 · prati0100 · commit 2ccdfb1c78e1 · 2019-08-26T04:23:13.000+05:30
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 &lt;me@yadavpratyush.com&gt;
diff --git a/lib/diff.tcl b/lib/diff.tcl
@@ -848,6 +848,8 @@ proc apply_or_revert_range_or_line {x y revert} {
 		puts -nonewline $p $wholepatch
 		close $p} err]} {
 		error_popup "$failed_msg\n\n$err"
+		unlock_index
+		return
 	}
 
 	unlock_index

Original file line number	Diff line number	Diff line change
`@@ -848,6 +848,8 @@ proc apply_or_revert_range_or_line {x y revert} {`
`848`	`848`	`puts -nonewline $p $wholepatch`
`849`	`849`	`close $p} err]} {`
`850`	`850`	`error_popup "$failed_msg\n\n$err"`
	`851`	`+ unlock_index`
	`852`	`+ return`
`851`	`853`	`}`
`852`	`854`
`853`	`855`	`unlock_index`