On Tue, Apr 26, 2016 at 11:20 AM, Stefan Beller <sbeller@xxxxxxxxxx> wrote:
> On Tue, Apr 26, 2016 at 11:05 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> I think the way for you to indicate that desire expected by this
>> series is to use "git branch" to set upstream of new-shiny-feature
>> branch to origin/master. Shouldn't that work, or is that too much
>> work?
>
> I can totally do that for longer series which require some back and forth.
>
So the submodule groups series is an example with some back and forth,
so I'll try to take that workflow with setting an upstream there for now.
As the groups stuff is based on origin/sb/submodule-init I set that as the
remote upstream branch. Upon checking that out I get:
Switched to branch 'submodule-groups'
Your branch is ahead of 'origin/sb/submodule-init' by 15 commits.
(use "git push" to publish your local commits)
The first 2 lines are correct, the third however is not correct. (I cannot push
to your repository, but only email patches)
So I wonder if
* I configured the wrong upstream branch
* the upstream branch concept is extended to more/other use cases by the
format.useAutoBase option. (In an email based workflow you would use the
a remote branch to a remote, which is not owned by yourself, so the push
advice is invalid from now on and we patch that message)
* using an explicit upstream branch is the wrong approach here and the
base should be implicit, i.e. Take the base sha1 and see if there is
(one/any) remote branch matching that sha1.
If there is, use the sha1 just fine.
Thanks,
Stefan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html