[PATCH] rebase: fix a sparse 'plain integer as NULL pointer' warning

Ramsay Jones· Aug 11, 2018, 21:52 UTC · lore

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

Hi Pratik,

If you need to re-roll your 'pk/rebase-in-c-4-opts' branch, could you please squash this into the relevant patch (commit b0721e7b48, "builtin rebase: support `-C` and `--whitespace=<type>`", 2018-08-08).

Thanks!

ATB, Ramsay Jones

 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to builtin/rebase.c +1 −1

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 42f5884ce9..fa7c5582f8 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -776,7 +776,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			   N_("gpg-sign?"), N_("GPG-sign commits")),
 		OPT_STRING_LIST(0, "whitespace", &whitespace,
 				N_("whitespace"), N_("passed to 'git apply'")),
-		OPT_SET_INT('C', 0, &opt_c, N_("passed to 'git apply'"),
+		OPT_SET_INT('C', NULL, &opt_c, N_("passed to 'git apply'"),
 			    REBASE_AM),
 		OPT_BOOL(0, "autostash", &options.autostash,
 			 N_("automatically stash/stash pop before and after")),

-- 
2.18.0

patchrebase: fix a sparse 'plain integer as NULL pointer' warning