git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Pratik Karki <predatoramigo@gmail.com>
Date
Jul 22, 2018, 04:51 UTC
Message-ID
<CAOZc8M_yXok6sPWw5CeptKTDsems4HAMWzNyRDTj9dCNivQ0SA@mail.gmail.com>
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:
Show 28 quoted lines
>
> 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

Previous: Beat Bolli
Message 2 of 2 in “fixup! builtin/rebase: support running "git rebase <upstream>"”
  1. fixup! builtin/rebase: support running "git rebase <upstream>"Beat Bolli, Jul 21, 2018
  2. Pratik KarkiJul 22, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.