From e00e13e2aa5e94dc77dedb8f2026198300c7c8fe Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 21 Nov 2014 11:17:57 -0800 Subject: [PATCH] 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 --- git-mergetool--lib.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 2b6635130..3e0638913 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 ) -- 2.11.0