summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-11-21 11:17:57 -0800
committerJunio C Hamano <gitster@pobox.com>2014-11-21 11:27:37 -0800
commite00e13e2aa5e94dc77dedb8f2026198300c7c8fe (patch)
treed7c3b9fbe2d850540eb4dfe12dd99cd40dc23701
parent3f78278beb9792368de7edbbb031c3a88e0038a1 (diff)
downloadgit-e00e13e2aa5e94dc77dedb8f2026198300c7c8fe.tar.gz
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>
-rw-r--r--git-mergetool--lib.sh1
1 files changed, 0 insertions, 1 deletions
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 )