[PATCH] mergetools: stop setting $status in merge_cmd()
- From
David Aguilar <davvid@gmail.com>
- Date
- Nov 21, 2014, 09:03 UTC
- Message-ID
- <1416560590-26088-1-git-send-email-davvid@gmail.com>
- In-Reply-To
- <1416532829-68662-4-git-send-email-davvid@gmail.com>
No callers rely on $status so there's don't need to set it during merge_cmd() for diffmerge, emerge, and kdiff3.
Signed-off-by: David Aguilar <davvid@gmail.com> --- This is based on the mergetool/difftool cleanup patches.
mergetools/diffmerge | 1 - mergetools/emerge | 1 - mergetools/kdiff3 | 1 - 3 files changed, 3 deletions(-)
diff --git a/mergetools/diffmerge b/mergetools/diffmerge index 85ac720..f138cb4 100644 --- a/mergetools/diffmerge +++ b/mergetools/diffmerge @@ -11,5 +11,4 @@ merge_cmd () { "$merge_tool_path" --merge \ --result="$MERGED" "$LOCAL" "$REMOTE" fi - status=$? } diff --git a/mergetools/emerge b/mergetools/emerge index f96d9e5..7b895fd 100644 --- a/mergetools/emerge +++ b/mergetools/emerge @@ -15,7 +15,6 @@ merge_cmd () { "$LOCAL" "$REMOTE" \ "$(basename "$MERGED")" fi - status=$? } translate_merge_tool_path() { diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index a30034f..793d129 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -20,5 +20,4 @@ merge_cmd () { -o "$MERGED" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 fi - status=$? }
-- 2.2.0.rc2.26.g6d3471d.dirty