b4 prep -n ignores b4.prep-cover-strategy

b4 prep -n ignores b4.prep-cover-strategy

[Markus Schneider-Pargmann]

Hi Konstantin,

maybe I am doing something wrong. I set the cover-strategy to
branch-description in ~/.gitconfig:
	[b4]
	        prep-cover-strategy = branch-description

Then I create a new branch using b4:
	b4 prep -n up/test -f v6.1

and it creates a commit instead of using the branch-description:
	a9fb7aa725a6 (HEAD -> b4/up-test) EDITME: cover title for up/test
	830b3c68c1fb (tag: v6.1) Linux 6.1

I verified the config variable:
	git config b4.prep-cover-strategy
		branch-description

And I am on the latest version:
	b4 version
		0.11.1

show-info shows that b4 is not picking up the cover-strategy:
	b4 prep --show-info
		branch: b4/up-test
		cover-subject: EDITME: cover title for up/test
		change-id: 20221223-up-test-d1f1526622b0
		revision: 1
		cover-strategy: commit
		base-branch: up/mtk/mt8365/power
		base-commit: 830b3c68c1fb1e9176028d02ef86f3cf76aa2476
		start-commit: a9fb7aa725a642cf72e16ff45d74a07e66c9b63e
		end-commit: a9fb7aa725a642cf72e16ff45d74a07e66c9b63e

Thanks,
Markus

Re: b4 prep -n ignores b4.prep-cover-strategy

[Konstantin Ryabitsev]

On Fri, Dec 23, 2022 at 06:01:14PM +0100, Markus Schneider-Pargmann wrote:
> Hi Konstantin,
> 
> maybe I am doing something wrong. I set the cover-strategy to
> branch-description in ~/.gitconfig:
> 	[b4]
> 	        prep-cover-strategy = branch-description
> 
> Then I create a new branch using b4:
> 	b4 prep -n up/test -f v6.1

Weird, I can't replicate this. Something else must be going on that overrides
the global setting.

> I verified the config variable:
> 	git config b4.prep-cover-strategy
> 		branch-description

The only other place I can think of is in .git/config for the up-test branch:

    [branch "b4/up-test"]
      b4-prep-cover-strategy = commit

However, this should have been deleted when you ran "git branch -D", so I'm
not sure why it would be left over in your .git/config.

If you can rerun "b4 -d prep -n ..." that should give some debug info during
branch creation that should help figure out what's going wrong.

-K

Re: b4 prep -n ignores b4.prep-cover-strategy

[Markus Schneider-Pargmann]

Hi Konstantin,

On Tue, Dec 27, 2022 at 10:29:44AM -0500, Konstantin Ryabitsev wrote:
> On Fri, Dec 23, 2022 at 06:01:14PM +0100, Markus Schneider-Pargmann wrote:
> > Hi Konstantin,
> > 
> > maybe I am doing something wrong. I set the cover-strategy to
> > branch-description in ~/.gitconfig:
> > 	[b4]
> > 	        prep-cover-strategy = branch-description
> > 
> > Then I create a new branch using b4:
> > 	b4 prep -n up/test -f v6.1
> 
> Weird, I can't replicate this. Something else must be going on that overrides
> the global setting.
> 
> > I verified the config variable:
> > 	git config b4.prep-cover-strategy
> > 		branch-description
> 
> The only other place I can think of is in .git/config for the up-test branch:
> 
>     [branch "b4/up-test"]
>       b4-prep-cover-strategy = commit
> 
> However, this should have been deleted when you ran "git branch -D", so I'm
> not sure why it would be left over in your .git/config.

Somehow it wasn't removed, thank you. I am not sure how I got there, I
can't reproduce it now. So, consider this solved for me, thank you!

Best,
Markus

> 
> If you can rerun "b4 -d prep -n ..." that should give some debug info during
> branch creation that should help figure out what's going wrong.
> 
> -K