allow non-fast-forward pushes to scratch branches?

allow non-fast-forward pushes to scratch branches?

[Eric Abrahamsen]

I've been working on this scratch/gnus-search branch, which is meant to
be rebased on features/gnus-select. At some point I made the mistake of
rebasing to master, when features/gnus-select had not been recently
rebased to master. I got that more or less sorted out, but I've done a
bunch of history re-writing on this scratch branch since, and I'd like
to just blast it and replace it with the current state.

I can't push with --force, because the repo (quite rightly) seems to
have denyNonFastforwards = true.

The branch really should just be rebased to features/gnus-select and
nothing else. Could non-fast-forward pushes be allowed to scratch
branches? Or maybe I can just delete the branch altogether, and push a
new one with the same name?

Apologies from a git git.

Eric

Re: allow non-fast-forward pushes to scratch branches?

[Yuri Khan]

On Wed, May 3, 2017 at 5:34 AM, Eric Abrahamsen <eric@ericabrahamsen.net> wrote:

> Or maybe I can just delete the branch altogether, and push a
> new one with the same name?

Past discussions on the same issue have listed this as a workaround, yes.

Re: allow non-fast-forward pushes to scratch branches?

[Eric Abrahamsen]

Yuri Khan <yuri.v.khan@gmail.com> writes:

> On Wed, May 3, 2017 at 5:34 AM, Eric Abrahamsen <eric@ericabrahamsen.net> wrote:
>
>> Or maybe I can just delete the branch altogether, and push a
>> new one with the same name?
>
> Past discussions on the same issue have listed this as a workaround, yes.

Thanks very much, I'll do that.

Re: allow non-fast-forward pushes to scratch branches?

[Ted Zlatanov]

On Wed, 03 May 2017 08:19:24 -0700 Eric Abrahamsen <eric@ericabrahamsen.net> wrote: 

EA> Yuri Khan <yuri.v.khan@gmail.com> writes:
>> On Wed, May 3, 2017 at 5:34 AM, Eric Abrahamsen <eric@ericabrahamsen.net> wrote:
>> 
>>> Or maybe I can just delete the branch altogether, and push a
>>> new one with the same name?
>> 
>> Past discussions on the same issue have listed this as a workaround, yes.

EA> Thanks very much, I'll do that.

...and can the Git diff script stop sending notifications when scratch
branches are deleted? That's the single biggest annoyance right now for
this workaround.

Ted