Re: What's cooking in git.git (Sep 2018, #04; Thu, 20)

From: Johannes Sixt <j6t@kdbg.org>
Date: Sep 21, 2018, 17:05 UTC
Message-ID: <e87e83c2-b371-1cc3-7eef-495f03ef05ef@kdbg.org>
In-Reply-To: <xmqqin2zxw55.fsf@gitster-ct.c.googlers.com>

Am 21.09.18 um 07:22 schrieb Junio C Hamano:

Show 6 quoted lines

> The tip of 'next' hasn't been rewound yet.  The three GSoC "rewrite
> in C" topics are still unclassified in this "What's cooking" report,
> but I am hoping that we can have them in 'next' sooner rather than
> later.  I got an impression that Dscho wanted a chance for the final
> clean-up on some of them, so I am not doing anything hasty yet at
> this moment, though.

While playing around with those topics in my own build on Windows, I noticed a small glitch in your merge commits.

When I compile 59085279e6, which is today's jch~11, I see

    CC builtin/rebase.o
builtin/rebase.c: In function 'can_fast_forward':
builtin/rebase.c:443:2: warning: implicit declaration of function 'get_merge_bases' [-Wimplicit-function-declaration]
  merge_bases = get_merge_bases(onto, head);
  ^
builtin/rebase.c:443:14: warning: assignment makes pointer from integer without a cast [enabled by default]
  merge_bases = get_merge_bases(onto, head);
              ^

I notice that you fixed it in the next merge, jch~10 aka d311e29abe, by adding

#include "commit-reach.h"

in builtin/rebase.c; this line is obviously required one merge commit earlier, jch~11.

-- Hannes