Skip to content

Commit e00e13e

Browse files
committed
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>
1 parent 3f78278 commit e00e13e

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

git-mergetool--lib.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ setup_user_tool () {
130130
then
131131
touch "$BACKUP"
132132
( eval $merge_tool_cmd )
133-
status=$?
134133
check_unchanged
135134
else
136135
( eval $merge_tool_cmd )

0 commit comments

Comments
 (0)