Re: What's cooking in git.git (Jul 2019, #06; Thu, 25)

From: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Date: Jul 27, 2019, 20:57 UTC
Message-ID: <20190727205732.16361-1-rohit.ashiwal265@gmail.com>
In-Reply-To: <CABPp-BEq+d=9G+U4im4fSEL2jGhggBwpoa+X7ZUjEGMPOPuFTw@mail.gmail.com>

Hi Elijah

On Sat, 27 Jul 2019 13:40:13 -0700 Elijah Newren <newren@gmail.com> wrote:

> 
> Let me attempt to answer on Junio's behalf...

:)

Show 8 quoted lines

> [...]
> There are four, including Junio's commit he had to add in order to
> make the series merge with pu (a rename of your t3431 to the
> unoccupied t3433 slot).  He labelled that commit "SQUASH???" and it's
> still quoted above.  However, in general, when you submit the next
> round of your series, you should certainly include his fixups from his
> squash (or alternative fixes) inside your commits in order to get rid
> of the need for the squash commit.

Understood!

Show 11 quoted lines

> > >  - rebase -i: support --committer-date-is-author-date
> > >  - sequencer: add NULL checks under read_author_script
> > >  - rebase -i: add --ignore-whitespace flag
> >
> > The correct order should be:
> >    - rebase -i: add --ignore-whitespace flag
> >    - sequencer: add NULL checks under read_author_script
> >    - rebase -i: support --committer-date-is-author-date
> 
> Are you thinking in order of application, or order that would be shown
> by `git log --oneline`?  Junio includes the latter in his report.

If applied in this order, I think, there is no need of fixups. But renaming t3431 to t3433 is still required.

Show 7 quoted lines

> > I'll soon send another revision and while on it, let's merge
> > these topics into one. Should I also rebase them on the tip
> > of git/git's master?
> 
> What do you mean by merge these topics into one?  Do you mean merge
> all the commits into a single commit (which would be bad), or that
> your two original topics should be one, much like Junio already did?

I am thinking of mergin the original topics, yes, just like Junio did.

> In general, once submitted, avoid rebasing unless needed to integrate
> with someone else's work and clean up conflicts.

I have not checked but git/git:master is like 569 commits ahead of r1walz/git:master, there _might_ be conflicts. Should I rebase if need be?

Thanks Rohit