From patchwork Fri Apr 23 19:42:19 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Luke Shumaker <lukeshu@lukeshu.com>
X-Patchwork-Id: 12221607
Return-Path: <git-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id E3B9AC433ED
	for <git@archiver.kernel.org>; Fri, 23 Apr 2021 19:43:07 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id C82C2613C3
	for <git@archiver.kernel.org>; Fri, 23 Apr 2021 19:43:07 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S243923AbhDWTnn (ORCPT <rfc822;git@archiver.kernel.org>);
        Fri, 23 Apr 2021 15:43:43 -0400
Received: from mav.lukeshu.com ([104.207.138.63]:35312 "EHLO mav.lukeshu.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S243905AbhDWTnf (ORCPT <rfc822;git@vger.kernel.org>);
        Fri, 23 Apr 2021 15:43:35 -0400
Received: from lukeshu-dw-thinkpad (unknown
 [IPv6:2601:281:8200:26:4e34:88ff:fe48:5521])
        by mav.lukeshu.com (Postfix) with ESMTPSA id 2AC9680591;
        Fri, 23 Apr 2021 15:42:58 -0400 (EDT)
From: Luke Shumaker <lukeshu@lukeshu.com>
To: git@vger.kernel.org
Cc: Avery Pennarun <apenwarr@gmail.com>,
 Charles Bailey <cbailey32@bloomberg.net>, Danny Lin <danny0838@gmail.com>,
 "David A . Greene" <greened@obbligato.org>, David Aguilar <davvid@gmail.com>,
 Jakub Suder <jakub.suder@gmail.com>, James Denholm <nod.helm@gmail.com>,
 Jeff King <peff@peff.net>, Jonathan Nieder <jrnieder@gmail.com>,
 Junio C Hamano <gitster@pobox.com>, =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?=
	=?utf-8?b?IER1eQ==?=  <pclouds@gmail.com>,
 Roger L Strain <roger.strain@swri.org>,
 Techlive Zheng <techlivezheng@gmail.com>, Luke Shumaker <lukeshu@datawire.io>
Subject: [PATCH 19/30] subtree: give `$(git --exec-path)` precedence over
 `$PATH`
Date: Fri, 23 Apr 2021 13:42:19 -0600
Message-Id: <20210423194230.1388945-20-lukeshu@lukeshu.com>
X-Mailer: git-send-email 2.31.1
In-Reply-To: <20210423194230.1388945-1-lukeshu@lukeshu.com>
References: <20210423194230.1388945-1-lukeshu@lukeshu.com>
MIME-Version: 1.0
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org

From: Luke Shumaker <lukeshu@datawire.io>

Other Git commands implemented in shell give `git --exec-path`
precedence over the existing $PATH, but subtree gives the existing $PATH
precedence.  Flip subtree's PATH around to match what other commands do.

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
---
 contrib/subtree/git-subtree.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 3105eb8033..9d365c9f2f 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -28,7 +28,7 @@ rejoin        merge the new branch back into HEAD
 squash        merge subtree changes as a single commit
 "
 
-PATH=$PATH:$(git --exec-path)
+PATH=$(git --exec-path):$PATH
 
 arg_debug=
 arg_command=