[0/6] Minimal patches to let reftable pass the CI builds

Message

Philippe Blain via GitGitGadget Nov. 28, 2020, 6:44 a.m. UTC

These patches fix the PR build failures at 
https://github.com/git/git/pull/847/checks?check_run_id=1460683728, and are
designed to be squashed into the 16 patches of the libreftable v3 patch
series as submitted at 
https://lore.kernel.org/git/[e-mail]/
.

A smaller form of the first patch was offered on the mailing list on May
4th: 
https://lore.kernel.org/git/ff60[e-mail]/
. The next three patches were presented to the mailing list on October 2nd: 
https://lore.kernel.org/git/[e-mail]/
, and 
https://lore.kernel.org/git/[e-mail]/
. Some of the patches required slight adjustments to accommodate for context
changes.

Going forward, I would like to avoid the impression that it is the
responsibility of the Git for Windows maintainer to keep the CI build
passing on Windows. I am happy to assist in case it is unclear how to fix
certain issues. I am not happy having to implement and test those fixes
myself. How can we ensure this doesn't happen in the future?

Johannes Schindelin (6):
  fixup! reftable: rest of library
  fixup! reftable: utility functions
  fixup! reftable: rest of library
  fixup! reftable: rest of library
  fixup! reftable: rest of library
  fixup! reftable: rest of library

 contrib/buildsystems/CMakeLists.txt | 14 +++++++--
 reftable/dump.c                     | 36 ++++++++++-------------
 reftable/stack.c                    | 37 ++++++++++++++++++------
 reftable/stack_test.c               | 44 ++++++++++++++++++-----------
 4 files changed, 82 insertions(+), 49 deletions(-)


base-commit: 6229da992e43f4a2d6f4ccaccf2dbbdf11bd5a4a
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-801%2Fdscho%2Freftable-on-windows-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-801/dscho/reftable-on-windows-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/801

Comments

Han-Wen Nienhuys Nov. 30, 2020, 2:26 p.m. UTC | #1

On Sat, Nov 28, 2020 at 7:44 AM Johannes Schindelin via GitGitGadget
<[e-mail]> wrote:
>
> These patches fix the PR build failures at
> https://github.com/git/git/pull/847/checks?check_run_id=1460683728, and are
> designed to be squashed into the 16 patches of the libreftable v3 patch
> series as submitted at
> https://lore.kernel.org/git/[e-mail]/
> .
>
> A smaller form of the first patch was offered on the mailing list on May
> 4th:
> https://lore.kernel.org/git/ff60[e-mail]/
> . The next three patches were presented to the mailing list on October 2nd:
> https://lore.kernel.org/git/[e-mail]/
> , and
> https://lore.kernel.org/git/[e-mail]/
> . Some of the patches required slight adjustments to accommodate for context
> changes.
>
> Going forward, I would like to avoid the impression that it is the
> responsibility of the Git for Windows maintainer to keep the CI build
> passing on Windows. I am happy to assist in case it is unclear how to fix
> certain issues. I am not happy having to implement and test those fixes
> myself. How can we ensure this doesn't happen in the future?

Thanks for the build system fix. I think it's OK to leave it to me to
solve the logic problems in the C code that you found.

Would you mind if I massaged these contributions directly back into
github.com/google/reftable? Google has a corporate CLA from Microsoft,
it's OK to accept this from you. For better or worse, this is still
where I'm developing reftable, until it has landed in git-core.

Johannes Schindelin Dec. 1, 2020, 2:18 p.m. UTC | #2

Hi Han-Wen,

On Mon, 30 Nov 2020, Han-Wen Nienhuys wrote:

> On Sat, Nov 28, 2020 at 7:44 AM Johannes Schindelin via GitGitGadget
> <[e-mail]> wrote:
> >
> > These patches fix the PR build failures at
> > https://github.com/git/git/pull/847/checks?check_run_id=1460683728, and are
> > designed to be squashed into the 16 patches of the libreftable v3 patch
> > series as submitted at
> > https://lore.kernel.org/git/[e-mail]/
> > .
> >
> > A smaller form of the first patch was offered on the mailing list on May
> > 4th:
> > https://lore.kernel.org/git/ff60[e-mail]/
> > . The next three patches were presented to the mailing list on October 2nd:
> > https://lore.kernel.org/git/[e-mail]/
> > , and
> > https://lore.kernel.org/git/[e-mail]/
> > . Some of the patches required slight adjustments to accommodate for context
> > changes.
> >
> > Going forward, I would like to avoid the impression that it is the
> > responsibility of the Git for Windows maintainer to keep the CI build
> > passing on Windows. I am happy to assist in case it is unclear how to fix
> > certain issues. I am not happy having to implement and test those fixes
> > myself. How can we ensure this doesn't happen in the future?
>
> Thanks for the build system fix. I think it's OK to leave it to me to
> solve the logic problems in the C code that you found.
>
> Would you mind if I massaged these contributions directly back into
> github.com/google/reftable?

Whatever works best for you.

> Google has a corporate CLA from Microsoft, it's OK to accept this from
> you. For better or worse, this is still where I'm developing reftable,
> until it has landed in git-core.

Ciao,
Dscho