From: Johannes Schindelin Date: Mon, 30 Sep 2019 09:55:31 +0000 (-0700) Subject: push: do not pretend to return `int` from `die_push_simple()` X-Git-Tag: v2.24.0-rc0~26^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbcd970c27ba42ab09073211f858b1a89c7f8300;p=thirdparty%2Fgit.git push: do not pretend to return `int` from `die_push_simple()` This function is marked as `NORETURN`, and it indeed does not want to return anything. So let's not declare it with the return type `int`. This fixes the following warning when building with MSVC: C4646: function declared with 'noreturn' has non-void return type Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/builtin/push.c b/builtin/push.c index 021dd3b1e4..d216270d5f 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -143,8 +143,8 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p) return remote->url_nr; } -static NORETURN int die_push_simple(struct branch *branch, - struct remote *remote) +static NORETURN void die_push_simple(struct branch *branch, + struct remote *remote) { /* * There's no point in using shorten_unambiguous_ref here,