b4 shazam in a subdir

b4 shazam in a subdir

[Andrew Cooper]

Hello,

When using b4 shazam in a subdir of a git repository, you end up with
the patch(es) applied correctly, but also the diff structure expanded
under the current dir, and the working tree dirty back to the state
prior to applying the patch(es).

Running from the root of the repo leaves everything in order, but it
would be great if b4 wasn't sensitive to $CWD inside a repository.

Thanks,

~Andrew

Re: b4 shazam in a subdir

[Konstantin Ryabitsev]

On Tue, May 02, 2023 at 06:06:15PM +0100, Andrew Cooper wrote:
> Hello,
> 
> When using b4 shazam in a subdir of a git repository, you end up with
> the patch(es) applied correctly, but also the diff structure expanded
> under the current dir, and the working tree dirty back to the state
> prior to applying the patch(es).
> 
> Running from the root of the repo leaves everything in order, but it
> would be great if b4 wasn't sensitive to $CWD inside a repository.

Thanks for the report.

bugbot assign to me

-K

Re: b4 shazam in a subdir

[Kernel.org Bugbot]

Hello:

This conversation is now tracked by Kernel.org Bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=217393

There is no need to do anything else, just keep talking.
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (peebz 0.1)

Re: b4 shazam in a subdir

[Kernel.org Bugbot]

Konstantin Ryabitsev writes in commit 73291165599839de9a2dcf4986c35a2041b22d09:

shazam: switch to top of git tree before running git-am

According to reports, running "git am" when not at the top of the tree
can result in the dirty tree state (see linked conversation). This
ensures that we switch back to the top of the git tree before running
"git am" and then switch back.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Link: https://msgid.link/4e4757cf-7351-9aff-fada-2b03ff82b2dc@citrix.com
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217393
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

(via https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=732911655998)
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (peebz 0.1)

Re: b4 shazam in a subdir

[andrew.cooper3]

On 22/06/2023 9:21 pm, Kernel.org Bugbot wrote:
> Konstantin Ryabitsev writes in commit 73291165599839de9a2dcf4986c35a2041b22d09:
>
> shazam: switch to top of git tree before running git-am
>
> According to reports, running "git am" when not at the top of the tree
> can result in the dirty tree state (see linked conversation). This
> ensures that we switch back to the top of the git tree before running
> "git am" and then switch back.
>
> Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Link: https://msgid.link/4e4757cf-7351-9aff-fada-2b03ff82b2dc@citrix.com
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217393
> Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
>
> (via https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=732911655998)

Just checked v0.12.3 and this is working now.  Thanks!

~Andrew