From: Luke Shumaker Date: Fri, 11 Jun 2021 01:02:15 GMT Subject: Re: [PATCH 2/2] subtree: fix assumption about the directory separator Message-ID: <878s3h6wo8.wl-lukeshu@lukeshu.com> In-Reply-To: <4e1a569c9fa494fa9bb1bfde14d77ac9751d9049.1623316412.git.gitgitgadget@gmail.com> On Thu, 10 Jun 2021 03:13:31 -0600, Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > 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 > --- > contrib/subtree/git-subtree.sh | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh > index 6bd689a6bb92..d11ac56f9eb8 100755 > --- a/contrib/subtree/git-subtree.sh > +++ b/contrib/subtree/git-subtree.sh > @@ -13,6 +13,8 @@ if test -z "$GIT_EXEC_PATH" || { > } > } || ! test -f "$GIT_EXEC_PATH/git-sh-setup" > then > + base=${0##*/} > + base=${base##*\\} This might be more clearly written as base=${0##*[/\\]} ? (And then maybe it doesn't need a separate variable, and can still be written in-line?) -- Happy hacking, ~ Luke Shumaker