From: Beat Bolli <dev+git@drbeat.li>
To: git@vger.kernel.org
Cc: Pratik Karki <predatoramigo@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Beat Bolli <dev+git@drbeat.li>
Subject: [PATCH] fixup! builtin/rebase: support running "git rebase <upstream>"
Date: Sat, 21 Jul 2018 14:49:52 +0200 [thread overview]
Message-ID: <20180721124952.26347-1-dev+git@drbeat.li> (raw)
The macro GIT_PATH_FUNC expands to a function definition that ends with
a closing brace. The extra semicolon produces a warning when compiling
with -pedantic.
Signed-off-by: Beat Bolli <dev+git@drbeat.li>
---
Junio, this applies on top of pk/rebase-in-c.
Thanks, Beat
builtin/rebase.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index e38ea80874..6aaae2436f 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -14,8 +14,8 @@
#include "refs.h"
#include "quote.h"
-static GIT_PATH_FUNC(apply_dir, "rebase-apply");
-static GIT_PATH_FUNC(merge_dir, "rebase-merge");
+static GIT_PATH_FUNC(apply_dir, "rebase-apply")
+static GIT_PATH_FUNC(merge_dir, "rebase-merge")
enum rebase_type {
REBASE_AM,
--
2.18.0.203.gfac676dfb9
next reply other threads:[~2018-07-21 12:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-21 12:49 Beat Bolli [this message]
2018-07-22 4:51 ` [PATCH] fixup! builtin/rebase: support running "git rebase <upstream>" Pratik Karki
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=20180721124952.26347-1-dev+git@drbeat.li \
--to=dev+git@drbeat.li \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=predatoramigo@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.