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

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

[Beat Bolli]

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

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

[Pratik Karki]

Hi,

On Sat, Jul 21, 2018 at 6:36 PM Beat Bolli <dev+git@drbeat.li> wrote:
>
> 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")
>

First of all, I apologize for not replying earlier to your review.
I have already fixed this macro in my local repository.

The new iteration of my patches was being held due to fixup of
`detach_head_to()` and I will soon submit a new iteration of patch
within a day or two.
Thank you for pointing this out.

Cheers,
Pratik Karki