From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Nov 2014 19:17:57 +0000 (-0800)
Subject: mergetool--lib: remove no-op assignment to $status from setup_user_tool
X-Git-Tag: v2.3.0-rc0~83^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e00e13e2aa5e94dc77dedb8f2026198300c7c8fe;p=thirdparty%2Fgit.git

mergetool--lib: remove no-op assignment to $status from setup_user_tool

Even though setup_user_tool assigns the exit status from "eval
$merge_tool_cmd" to $status, the variable is overwritten by the
function it calls next, check_unchanged, without ever getting looked
at by anybody.  And "return $status" at the end of this function
returns the value check_unchanged assigned to it (which is the same
as the value the function returns).  Which makes the assignment a
no-op.

Remove it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 2b6635130a..3e06389136 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -130,7 +130,6 @@ setup_user_tool () {
 		then
 			touch "$BACKUP"
 			( eval $merge_tool_cmd )
-			status=$?
 			check_unchanged
 		else
 			( eval $merge_tool_cmd )