[ovs-dev] [PATCH ovn] docs: fix git format-patch command for backports

Ihar Hrachyshka ihrachys at redhat.com
Wed Jun 30 13:43:27 UTC 2021


On Tue, Jun 29, 2021 at 1:18 PM Ben Pfaff <blp at ovn.org> wrote:
>
> On Tue, Jun 29, 2021 at 12:50:54PM -0400, Ihar Hrachyshka wrote:
> > On Tue, Jun 29, 2021 at 12:46 PM Ben Pfaff <blp at ovn.org> wrote:
> > >
> > > On Tue, Jun 29, 2021 at 12:24:11PM -0400, Ihar Hrachyshka wrote:
> > > > One, HEAD~, not HEAD, should be used to generate any patches. Two, add
> > > > "ovn" to the generated mail topic. Third, update branch name to a
> > > > fresh one.
> > > >
> > > > Signed-off-by: Ihar Hrachyshka <ihrachys at redhat.com>
> > >
> > > Both of these look odd to me:
> > > > -    $ git format-patch HEAD --subject-prefix="PATCH branch-2.7"
> > > > +    $ git format-patch HEAD~ --subject-prefix="PATCH ovn branch-21.06"
> > >
> > > I think the idea here is to just generate one patch from the tip of the
> > > current branch.  HEAD~ works but I'd normally write -1 instead.
> > >
> >
> > Yes. But HEAD doesn't generate any patches since it's a head and there
> > are no patches "above" it. Am I missing something?
>
> You're correct.  -1 and HEAD~ have the same effect, but -1 is the more
> common way to write it.
>

I can't comment on what's more common (personally using HEAD~ hence
putting it here), but I don't mind if we change to -1 and not HEAD~.
Whatever works.

Ihar



More information about the dev mailing list