David Aguilar <davvid@xxxxxxxxx> writes:
> This is a cleanup series to remove the use of the $status
> global variable in mergetool/difftool.
>
> This should wait until after the current RC series is
> over but figured I'd send it out.
>
> David Aguilar (3):
> mergetool--lib: remove use of $status global
> difftool--helper: add explicit exit statement
> mergetool: simplify conditionals
>
> git-difftool--helper.sh | 2 ++
> git-mergetool--lib.sh | 20 +++++---------------
> git-mergetool.sh | 16 +++++-----------
> 3 files changed, 12 insertions(+), 26 deletions(-)
Looked quite straight-forward from a cursory read.
I tentatively inserted the attached patch before 1/3. If the series
was done with that extra step as preliminary clean-up, I wouldn't
have had to wonder if the hunk at "@@ -130,13" was correct.
-- >8 --
From: Junio C Hamano <gitster@xxxxxxxxx>
Date: Fri, 21 Nov 2014 11:17:57 -0800
Subject: [PATCH] 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@xxxxxxxxx>
---
git-mergetool--lib.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 2b66351..3e06389 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 )
--
2.2.0-rc2-128-ge2b5e8e
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html