From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH] range-diff: fix some 'hdr-check' and sparse warnings
Date: Thu, 11 Jul 2019 23:03:03 +0100 [thread overview]
Message-ID: <e6796c60-a870-e761-3b07-b680f934c537@ramsayjones.plus.com> (raw)
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Hi Thomas,
If you need to re-roll your 'tg/range-diff-output-update' branch, could
you please squash (parts) of this into the relevant patches.
The first hunk fixes a couple of 'hdr-check' warnings:
$ diff nhcout phcout | head
4a5,13
> apply.h:146:22: error: ‘GIT_MAX_HEXSZ’ undeclared here (not in a function); did you mean ‘NI_MAXHOST’?
> char old_oid_prefix[GIT_MAX_HEXSZ + 1];
> ^~~~~~~~~~~~~
> NI_MAXHOST
> apply.h:151:19: error: array type has incomplete element type ‘struct object_id’
> struct object_id threeway_stage[3];
> ^~~~~~~~~~~~~~
> Makefile:2775: recipe for target 'apply.hco' failed
> make: *** [apply.hco] Error 1
$
and needs to be applied to commit b9f62a7e24 ("apply: make parse_git_header
public", 2019-07-08).
The second hunk fixes a sparse 'Using plain integer as NULL pointer'
warning, and needs to be applied to commit 04539fc67b ("range-diff: add
section header instead of diff header", 2019-07-08).
Thanks!
ATB,
Ramsay Jones
apply.h | 1 +
range-diff.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/apply.h b/apply.h
index ade50f66c5..c8c9287cb2 100644
--- a/apply.h
+++ b/apply.h
@@ -3,6 +3,7 @@
#include "lockfile.h"
#include "string-list.h"
+#include "hash.h"
struct repository;
diff --git a/range-diff.c b/range-diff.c
index ba1e9a4265..0f24a4ad12 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -102,7 +102,7 @@ static int read_patches(const char *range, struct string_list *list)
}
if (starts_with(line, "diff --git")) {
- struct patch patch = { 0 };
+ struct patch patch = { NULL };
struct strbuf root = STRBUF_INIT;
int linenr = 0;
--
2.22.0
next reply other threads:[~2019-07-11 22:03 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 22:03 Ramsay Jones [this message]
2019-07-12 5:21 ` [PATCH] range-diff: fix some 'hdr-check' and sparse warnings Johannes Sixt
2019-07-12 16:44 ` Junio C Hamano
2019-07-13 10:44 ` Johannes Sixt
2019-07-13 12:18 ` Johannes Sixt
2019-07-13 12:56 ` Carlo Arenas
2019-07-13 21:29 ` Junio C Hamano
2019-07-13 22:22 ` Carlo Arenas
2019-07-14 0:51 ` Jeff King
2019-07-14 8:30 ` Johannes Sixt
2019-07-15 14:46 ` Jeff King
2019-07-15 17:30 ` Johannes Sixt
2019-07-15 18:15 ` Jeff King
2019-07-16 19:01 ` Junio C Hamano
2019-07-16 20:01 ` Jeff King
2019-07-17 18:13 ` Junio C Hamano
2019-07-17 19:21 ` Jeff King
2019-07-17 20:10 ` Junio C Hamano
2019-07-17 17:23 ` Johannes Sixt
2019-07-15 14:47 ` Johannes Schindelin
2020-10-02 17:03 ` Junio C Hamano
2020-10-04 18:35 ` Johannes Schindelin
2019-07-14 8:15 ` Johannes Sixt
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=e6796c60-a870-e761-3b07-b680f934c537@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=t.gummerer@gmail.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).