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

Johannes Sixt [off-list ref] writes:

Am 21.09.18 um 07:22 schrieb Junio C Hamano:

quoted

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.

Thanks.  Near the problematic merges are

    41e89b1c02 Merge branch 'pk/rebase-in-c-6-final' into jch
    a9794eb0fe Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i-in-c' into jch
    d348159563 Merge branch 'pk/rebase-in-c-5-test' into jch
    d311e29abe Merge branch 'pk/rebase-in-c-4-opts' into jch
    59085279e6 Merge branch 'pk/rebase-in-c-3-acts' into jch
    88091f8941 Merge branch 'pk/rebase-in-c-2-basic' into jch
    38a693a042 Merge branch 'ps/stash-in-c' into jch
    488f36e338 Merge branch 'ag/rebase-i-in-c' into jch

Actually 88091f8941 is already broken.  The merge-fix must go there.

Thanks for letting me know (even though it is very unlikely that
2-basic would graduate without any of these other topics---in a
sense there is not much point for these patches to be spread across
this many topics).

commit a581ba92f4f4e112a7d7e0c84c0ced1af271b7dc
Author: Junio C Hamano [off-list ref]
Date:   Fri Sep 21 10:14:43 2018 -0700

    merge-fix/pk/rebase-in-c-2-basic

diff --git a/builtin/rebase.c b/builtin/rebase.c
index e817956d96..71367c8530 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c

@@ -21,6 +21,7 @@
 #include "diff.h"
 #include "wt-status.h"
 #include "revision.h"
+#include "commit-reach.h"
 
 static char const * const builtin_rebase_usage[] = {
 	N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "