[PATCH v3 3/4] git-gui: return early when patch fails to apply

From: Pratyush Yadav <me@yadavpratyush.com>
To: <git@vger.kernel.org>
Cc: Pratyush Yadav <me@yadavpratyush.com>,
	Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>,
	Bert Wesarg <bert.wesarg@googlemail.com>
Subject: [PATCH v3 3/4] git-gui: return early when patch fails to apply
Date: Thu, 29 Aug 2019 03:27:24 +0530	[thread overview]
Message-ID: <20190828215725.13376-4-me@yadavpratyush.com> (raw)
In-Reply-To: <20190828215725.13376-1-me@yadavpratyush.com>

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>
---
 lib/diff.tcl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/diff.tcl b/lib/diff.tcl
index ffca788..0659029 100644
--- 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
-- 
2.21.0

