* [PATCH] fixup! builtin/rebase: support running "git rebase <upstream>"
@ 2018-07-21 12:49 Beat Bolli
2018-07-22 4:51 ` Pratik Karki
0 siblings, 1 reply; 2+ messages in thread
From: Beat Bolli @ 2018-07-21 12:49 UTC (permalink / raw)
To: git; +Cc: Pratik Karki, Junio C Hamano, 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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] fixup! builtin/rebase: support running "git rebase <upstream>"
2018-07-21 12:49 [PATCH] fixup! builtin/rebase: support running "git rebase <upstream>" Beat Bolli
@ 2018-07-22 4:51 ` Pratik Karki
0 siblings, 0 replies; 2+ messages in thread
From: Pratik Karki @ 2018-07-22 4:51 UTC (permalink / raw)
To: dev+git; +Cc: git, Junio C Hamano
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-22 4:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-21 12:49 [PATCH] fixup! builtin/rebase: support running "git rebase <upstream>" Beat Bolli
2018-07-22 4:51 ` Pratik Karki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox