git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: hanwen@google.com, "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH 4/3] fixup! reftable: add dump utility
Date: Tue,  3 Aug 2021 23:44:34 -0700	[thread overview]
Message-ID: <20210804064434.42236-1-carenas@gmail.com> (raw)
In-Reply-To: <20210802190054.58282-1-carenas@gmail.com>

avoid _XOPEN_SOURCE in alpine by making sure git-compat-util.h is included
first (through hash.h) as recommended and therefore avoid:

  In file included from ./hash.h:4,
                   from reftable/dump.c:19:
  ./git-compat-util.h:147: warning: "_XOPEN_SOURCE" redefined
    147 | #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
        |
  In file included from /usr/include/unistd.h:8,
                   from reftable/reftable-writer.h:15,
                   from reftable/dump.c:14:
  /usr/include/features.h:16: note: this is the location of the previous definition
     16 | #define _XOPEN_SOURCE 700
        |

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
This allows for the alpine CI job to build, but will still fail with the
reported segfault in the subcommand for `git reflog`.

It is important to note that it only happens in "seen" though, as the same
code merged to master pass that test (even if it might fail somewhere else)

 reftable/dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reftable/dump.c b/reftable/dump.c
index 668cfa8996..eb7b2b4161 100644
--- a/reftable/dump.c
+++ b/reftable/dump.c
@@ -6,6 +6,7 @@ license that can be found in the LICENSE file or at
 https://developers.google.com/open-source/licenses/bsd
 */
 
+#include "hash.h"
 #include "reftable-blocksource.h"
 #include "reftable-error.h"
 #include "reftable-merged.h"
@@ -16,7 +17,6 @@ license that can be found in the LICENSE file or at
 #include "reftable-reader.h"
 #include "reftable-stack.h"
 #include "reftable-generic.h"
-#include "hash.h"
 
 #include <stddef.h>
 #include <stdio.h>
-- 
2.33.0.rc0.443.g98cc19b6c0


  parent reply	other threads:[~2021-08-04  6:45 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-02 19:00 [PATCH 0/3] hn/reftable "fixes" for OpenBSD Carlo Marcelo Arenas Belón
2021-08-02 19:00 ` [PATCH 1/3] fixup! Provide zlib's uncompress2 from compat/zlib-compat.c Carlo Marcelo Arenas Belón
2021-08-02 19:00 ` [PATCH 2/3] reftable: clarify zlib version dependency Carlo Marcelo Arenas Belón
2021-08-02 19:00 ` [PATCH 3/3] openbsd: allow reftable building with zlib 1.2.3 Carlo Marcelo Arenas Belón
2021-08-04  6:44 ` Carlo Marcelo Arenas Belón [this message]
2021-08-04 17:24   ` [PATCH 4/3] fixup! reftable: add dump utility Junio C Hamano
2021-08-16  1:15 ` [PATCH v2 0/7] hn/reftable "fixes" for BSD Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 1/7] fixup! Provide zlib's uncompress2 from compat/zlib-compat.c Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 2/7] reftable: clarify zlib version dependency Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 3/7] openbsd: allow reftable building with zlib 1.2.3 Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 4/7] fixup! reftable: add dump utility Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 5/7] fixup! Provide zlib's uncompress2 from compat/zlib-compat.c Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 6/7] fixup! reftable: reftable file level tests Carlo Marcelo Arenas Belón
2021-08-16  1:15   ` [PATCH v2 7/7] fixup! reftable: (de)serialization for the polymorphic record type Carlo Marcelo Arenas Belón

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210804064434.42236-1-carenas@gmail.com \
    --to=carenas@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=hanwen@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).