undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool--lib: remove no-op assignment to $status from setup_user_tool

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2014-11-21 11:17:57 -08:00
parent 3f78278beb
commit e00e13e2aa
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-mergetool--lib.sh
View File

@ -130,7 +130,6 @@ setup_user_tool () {
then then
touch "$BACKUP" touch "$BACKUP"
( eval $merge_tool_cmd ) ( eval $merge_tool_cmd )
status=$?
check_unchanged check_unchanged
else else
( eval $merge_tool_cmd ) ( eval $merge_tool_cmd )