git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Luke Shumaker <lukeshu@lukeshu.com>,
	Johannes Schindelin <johannes.schindelin@gmx.de>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2 2/2] subtree: fix assumption about the directory separator
Date: Mon, 14 Jun 2021 12:41:53 +0000	[thread overview]
Message-ID: <a6f7aa40485f6bdd271ff8797159d8affbd024a2.1623674514.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.978.v2.git.1623674513.gitgitgadget@gmail.com>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

On Windows, both forward and backslash are valid separators. In
22d550749361 (subtree: don't fuss with PATH, 2021-04-27), however, we
added code that assumes that it can only be the forward slash.

Let's fix that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 contrib/subtree/git-subtree.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 3935cea7dd13..7f767b5c38fe 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -10,6 +10,7 @@ if test -z "$GIT_EXEC_PATH" || ! test -f "$GIT_EXEC_PATH/git-sh-setup" || {
 	test ! "$GIT_EXEC_PATH" -ef "${PATH%%:*}" 2>/dev/null
 }
 then
+	basename=${0##*[/\\]}
 	echo >&2 'It looks like either your git installation or your'
 	echo >&2 'git-subtree installation is broken.'
 	echo >&2
@@ -17,10 +18,10 @@ then
 	echo >&2 " - If \`git --exec-path\` does not print the correct path to"
 	echo >&2 "   your git install directory, then set the GIT_EXEC_PATH"
 	echo >&2 "   environment variable to the correct directory."
-	echo >&2 " - Make sure that your \`${0##*/}\` file is either in your"
+	echo >&2 " - Make sure that your \`$basename\` file is either in your"
 	echo >&2 "   PATH or in your git exec path (\`$(git --exec-path)\`)."
-	echo >&2 " - You should run git-subtree as \`git ${0##*/git-}\`,"
-	echo >&2 "   not as \`${0##*/}\`." >&2
+	echo >&2 " - You should run git-subtree as \`git ${basename#git-}\`,"
+	echo >&2 "   not as \`$basename\`." >&2
 	exit 126
 fi
 
-- 
gitgitgadget

      parent reply	other threads:[~2021-06-14 12:42 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-10  9:13 [PATCH 0/2] Fix git subtree on Windows Johannes Schindelin via GitGitGadget
2021-06-10  9:13 ` [PATCH 1/2] subtree: fix the GIT_EXEC_PATH sanity check to work " Johannes Schindelin via GitGitGadget
2021-06-11  0:40   ` Luke Shumaker
2021-06-11  1:37     ` Junio C Hamano
2021-06-11  4:31       ` Luke Shumaker
2021-06-11 10:19     ` Johannes Schindelin
2021-06-11 13:41       ` Luke Shumaker
2021-06-14 11:56         ` Johannes Schindelin
2021-06-15  2:33           ` Junio C Hamano
2021-06-15 10:56             ` Jeff King
2021-06-15 11:05               ` Bagas Sanjaya
2021-06-15 11:18                 ` Jeff King
2021-06-15 11:27                   ` Johannes Schindelin
2021-06-16  0:52               ` Junio C Hamano
2021-06-16  7:49                 ` Jeff King
2021-06-10  9:13 ` [PATCH 2/2] subtree: fix assumption about the directory separator Johannes Schindelin via GitGitGadget
2021-06-11  1:02   ` Luke Shumaker
2021-06-11 10:35     ` Johannes Schindelin
2021-06-11  0:58 ` [PATCH 0/2] Fix git subtree on Windows Luke Shumaker
2021-06-11 10:30   ` Johannes Schindelin
2021-06-11 13:46     ` Luke Shumaker
2021-06-11 15:50     ` Felipe Contreras
2021-06-12  2:58       ` Luke Shumaker
2021-06-14 12:41 ` [PATCH v2 " Johannes Schindelin via GitGitGadget
2021-06-14 12:41   ` [PATCH v2 1/2] subtree: fix the GIT_EXEC_PATH sanity check to work " Johannes Schindelin via GitGitGadget
2021-06-15  2:37     ` Junio C Hamano
2021-06-14 12:41   ` Johannes Schindelin via GitGitGadget [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a6f7aa40485f6bdd271ff8797159d8affbd024a2.1623674514.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    --cc=lukeshu@lukeshu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).