Can't release from branch that is tracking non-origin remote

[rchl]

I have a master branch configured like so:

[branch "master"]
	remote = upstream
	merge = refs/heads/master
	rebase = true

When I try to release from that branch, it fails with:

ERROR fatal: You are pushing to remote 'origin', which is not the upstream of
your current branch 'master', without telling me what to push
to update which remote branch.

So the code is explicitly trying to push (see here) to origin remote which is not the remote the branch is tracking. I know I can configure remote with git.pushRepo but doing that would be wrong as that would affect every developer on the project and there is no guarantee they have set up their git repo the same way.

Since release-it already (by default) enforces that branch is tracking upstream branch, I don't see why it's explicitly passing upstream in this case. I think it would be enough to just invoke git push alone.

[webpro]

You can do --git.pushRepo=upstream (and not store this as config).

I forgot why the explicit origin is there, maybe it can be removed indeed, as it's the default anyway.

[rchl]

I've created PR #609 with a suggested change.
Not 100% sure that the logic is correct...

[webpro]

This is now in release-it@13.0.0-beta.0, please let me know how this works for you (note that there are some breaking changes).

[rchl]

Thank you, I'll check as soon as I have some meaningful changes to release in my project.

[rchl]

With release-it@13.0.0-beta.1 getting:

yarn run v1.22.0                                                                                                                                                                   
$ release-it                                                                                                                                                                       
internal/modules/cjs/loader.js:638
    throw err;
    ^

Error: Cannot find module '../config/release-it.json'
    at Function.Module._resolveFilename (internal/modules/cjs/loader.js:636:15)
    at Function.Module._load (internal/modules/cjs/loader.js:562:25)
    at Module.require (internal/modules/cjs/loader.js:692:17)
    at require (internal/modules/cjs/helpers.js:25:18)
    at Object.<anonymous> (/Users/me/workspace/nuxt/nuxt-i18n/node_modules/release-it/lib/config.js:8:23)
    at Module._compile (internal/modules/cjs/loader.js:778:30)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:789:10)
    at Module.load (internal/modules/cjs/loader.js:653:32)
    at tryModuleLoad (internal/modules/cjs/loader.js:593:12)
    at Function.Module._load (internal/modules/cjs/loader.js:585:3)

Need to add templates and config to package.json files array. And remove conf.

[webpro]

Thanks, it's in release-it@beta (13.0.0-beta.2) now.

[rchl]

I have another issue. Getting this output:

🚀 Let's release nuxt-i18n (currently at 6.6.0)

...

? Commit (chore: release %s)? (Y/n) 

Not how the release version is missing on last line. It works with latest 12:

🚀 Let's release nuxt-i18n (currently at 6.6.0)

...

? Commit (chore: release 6.6.1)? (Y/n) 

[webpro]

Yes, the %s is old syntax, removed in v13. You should replace it with ${version}

[rchl]

Sorry, my bad.

[rchl]

I also need to think about some related fix for getRemoteUrl in GitBase.js. It also should default to tracking branch rather than origin...

[webpro]

Ah indeed, forgot about that. Doesn't seem trivial. Maybe we can parse output like this:

❯ git status -sb
## master...origin/master

[rchl]

Created #614