# [PATCH] fixup! builtin/rebase: support running "git rebase " 2 messages from 2018-07-21 to 2018-07-22. Participants: Beat Bolli, Pratik Karki. Thread: https://gitlist.dev/t/48931 ## Beat Bolli, 2018-07-21 12:49 Subject: [PATCH] fixup! builtin/rebase: support running "git rebase " Message-ID: <20180721124952.26347-1-dev+git@drbeat.li> URL: https://gitlist.dev/e/20180721124952.26347-1-dev%2Bgit%40drbeat.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 --- 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 ``` ## Pratik Karki, 2018-07-22 04:51 Subject: Re: [PATCH] fixup! builtin/rebase: support running "git rebase " Message-ID: URL: https://gitlist.dev/e/CAOZc8M_yXok6sPWw5CeptKTDsems4HAMWzNyRDTj9dCNivQ0SA%40mail.gmail.com In-Reply-To: <20180721124952.26347-1-dev+git@drbeat.li> ``` Hi, On Sat, Jul 21, 2018 at 6:36 PM Beat Bolli 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 > --- > > 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 ```