From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: tools@linux.kernel.org, users@linux.kernel.org
Subject: Re: b4: introducing b4 shazam (like b4 am -o- | git am)
Date: Tue, 28 Sep 2021 20:22:59 +0200 [thread overview]
Message-ID: <CAMuHMdUubqhqyDwkO_x98-M_i1tXsA5KfxhM1RDhrbhby8QT5w@mail.gmail.com> (raw)
In-Reply-To: <20210924210826.ebi3ljjdfiuie2pr@nitro.local>
Hi Konstantin,
On Fri, Sep 24, 2021 at 11:08 PM Konstantin Ryabitsev
<konstantin@linuxfoundation.org> wrote:
> On Thu, Sep 23, 2021 at 10:51:21AM +0200, Geert Uytterhoeven wrote:
> > [...]
> > Magic: Preparing a sparse worktree
> > Error running sparse-checkout init
> > fatal: Unable to create
> > '.git/worktrees/tmpz9m4cwww/info/sparse-checkout.lock': No such file
> > or directory
>
> Interesting. Are you already in a detached worktree, perhaps?
>
> > According to "git help sparse-checkout", my git (2.25.1, Ubuntu
> > 20.04.3LTS) does have support for that command.
>
> I suggest you repeat the following manually:
>
> git worktree add --detach --no-checkout /tmp/foofoo
> pushd /tmp/foofoo
> git sparse-checkout ini
s/ini/init/
Fails with:
fatal: Unable to create
'/path/to/repo/.git/worktrees/foofoo/info/sparse-checkout.lock': No
such file or directory
The info dir is missing:
$ ls -l /path/to/repo/.git/worktrees/foofoo/
total 20
-rw-rw-r-- 1 geert geert 6 sep 28 20:14 commondir
-rw-rw-r-- 1 geert geert 30 sep 28 20:14 config.worktree
-rw-rw-r-- 1 geert geert 17 sep 28 20:14 gitdir
-rw-rw-r-- 1 geert geert 41 sep 28 20:14 HEAD
drwxrwsr-x 2 geert geert 4096 sep 28 20:14 logs/
> git checkout
>
> then, regardless of what happens above:
>
> popd
> git worktree remove /tmp/foofoo
needs --force, else it fails with:
fatal: '/tmp/foofoo' contains modified or untracked files, use
--force to delete it
> That's basically all we're doing.
>
> > Note that with -s, the Link: tag appears below my Sob, while
> > b4 am + git am -s adds my Sob below the Link: tag.
>
> Unfortunately, I can't control this beyond reversing this for everyone. The
> only other alternative is setting up b4.shazam.am-flags variable for what to
> pass to "git am" -- which may be a good idea anyway.
The current behavior of b4 shazam does obfuscate the patch trail.
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2021-09-28 18:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 20:25 b4: introducing b4 shazam (like b4 am -o- | git am) Konstantin Ryabitsev
2021-09-22 17:38 ` Jason Gunthorpe
2021-09-22 18:21 ` Konstantin Ryabitsev
2021-09-28 17:46 ` Jason Gunthorpe
2021-09-29 21:18 ` Konstantin Ryabitsev
2021-09-29 23:30 ` Jason Gunthorpe
2021-09-30 14:45 ` Konstantin Ryabitsev
2021-10-01 16:20 ` Mark Brown
2021-09-23 8:51 ` Geert Uytterhoeven
2021-09-24 21:08 ` Konstantin Ryabitsev
2021-09-28 18:22 ` Geert Uytterhoeven [this message]
2021-09-29 13:39 ` Rob Herring
2021-09-29 17:54 ` Geert Uytterhoeven
2021-09-29 18:07 ` Jason Gunthorpe
2021-09-29 14:27 ` Konstantin Ryabitsev
2021-10-19 14:49 ` Rob Herring
2021-10-19 16:30 ` Konstantin Ryabitsev
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=CAMuHMdUubqhqyDwkO_x98-M_i1tXsA5KfxhM1RDhrbhby8QT5w@mail.gmail.com \
--to=geert@linux-m68k.org \
--cc=konstantin@linuxfoundation.org \
--cc=tools@linux.kernel.org \
--cc=users@linux.kernel.org \
/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).