On Sat, Jan 14, 2017 at 10:05 AM, Jeff King wrote:
> On Sat, Jan 14, 2017 at 06:57:13PM +0100, Johannes Schindelin wrote:
>
>> On Thu, 12 Jan 2017, Junio C Hamano wrote:
>>
>> > Johannes Schindelin writes:
>> >
>> > >
>> > > - if (!commit->parents) {
>>
On Sat, Jan 14, 2017 at 06:57:13PM +0100, Johannes Schindelin wrote:
> On Thu, 12 Jan 2017, Junio C Hamano wrote:
>
> > Johannes Schindelin writes:
> >
> > >
> > > - if (!commit->parents) {
> > > + if (!commit->parents)
> > > parent = NULL;
> > > - }
> >
Hi Junio,
On Thu, 12 Jan 2017, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >
> > - if (!commit->parents) {
> > + if (!commit->parents)
> > parent = NULL;
> > - }
> > else if (commit->parents->next) {
> > /* Reverting
Johannes Schindelin writes:
>
> - if (!commit->parents) {
> + if (!commit->parents)
> parent = NULL;
> - }
> else if (commit->parents->next) {
> /* Reverting or cherry-picking a merge commit */
> int cnt;
This was noticed while addressing Junio Hamano's concern that some
"else" operators were on separate lines than the preceding closing
brace.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
5 matches
Mail list logo