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>
Junio C Hamano committed
Nov 21, 2014 at 11:17 UTC
e00e13e2aa5e94dc77dedb8f2026198300c7c8fe
1 file changed
-1
git-mergetool--lib.sh
-1
@@ -130,7 +130,6 @@ setup_user_tool () {
130
then
131
touch "$BACKUP"
132
( eval $merge_tool_cmd )
133
- status=$?
133
check_unchanged
134
else
135
( eval $merge_tool_cmd )