[PATCH] fixup! builtin/rebase: support running "git rebase <upstream>"

From: Beat Bolli <dev+git@drbeat.li>
Date: Jul 21, 2018, 12:49 UTC
Message-ID: <20180721124952.26347-1-dev+git@drbeat.li>

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