From: Pratik Karki <predatoramigo@gmail.com>
To: dev+git@drbeat.li
Cc: git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] fixup! builtin/rebase: support running "git rebase <upstream>"
Date: Sun, 22 Jul 2018 10:36:53 +0545 [thread overview]
Message-ID: <CAOZc8M_yXok6sPWw5CeptKTDsems4HAMWzNyRDTj9dCNivQ0SA@mail.gmail.com> (raw)
In-Reply-To: <20180721124952.26347-1-dev+git@drbeat.li>
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
prev parent reply other threads:[~2018-07-22 4:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-21 12:49 [PATCH] fixup! builtin/rebase: support running "git rebase <upstream>" Beat Bolli
2018-07-22 4:51 ` Pratik Karki [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAOZc8M_yXok6sPWw5CeptKTDsems4HAMWzNyRDTj9dCNivQ0SA@mail.gmail.com \
--to=predatoramigo@gmail.com \
--cc=dev+git@drbeat.li \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).