From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Luke Shumaker <lukeshu@lukeshu.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Luke Shumaker <lukeshu@datawire.io>
Subject: Re: [PATCH 2/2] subtree: fix assumption about the directory separator
Date: Fri, 11 Jun 2021 12:35:55 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2106111235110.57@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <878s3h6wo8.wl-lukeshu@lukeshu.com>
Hi Luke,
On Thu, 10 Jun 2021, Luke Shumaker wrote:
> On Thu, 10 Jun 2021 03:13:31 -0600,
> Johannes Schindelin via GitGitGadget wrote:
> >
> > 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 | 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##*[/\\]}
>
> ?
True. For some reason, this did not work in my tests (probably because I
confused `#` with `%` or put the wildcard on the wrong side, or
something).
Will fix.
> (And then maybe it doesn't need a separate variable, and can still be
> written in-line?)
I am not in favor of inlining here. Three times. It is too complicated a
construct for a casual contributor. At least giving it a name (where
"basename" would make even more sense than "base", I just realized)
alleviates this problem _somewhat_.
Ciao,
Dscho
next prev parent reply other threads:[~2021-06-11 10:36 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 [this message]
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 ` [PATCH v2 2/2] subtree: fix assumption about the directory separator Johannes Schindelin via GitGitGadget
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2106111235110.57@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=lukeshu@datawire.io \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).