Skip to content

Commit

Permalink
mergetool--lib: remove no-op assignment to $status from setup_user_tool
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Nov 21, 2014
1 parent 3f78278 commit e00e13e
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion git-mergetool--lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ setup_user_tool () {
then
touch "$BACKUP"
( eval $merge_tool_cmd )
status=$?
check_unchanged
else
( eval $merge_tool_cmd )
Expand Down

0 comments on commit e00e13e

Please sign in to comment.