{"thread":{"id":"48931","subject":"[PATCH] fixup! builtin/rebase: support running \"git rebase <upstream>\"","startedAt":"2018-07-21T12:52:10Z","lastAt":"2018-07-22T04:52:07Z","messageCount":2,"participants":["Beat Bolli","Pratik Karki"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"353248","messageId":"20180721124952.26347-1-dev+git@drbeat.li","threadId":"48931","inReplyTo":null,"subject":"[PATCH] fixup! builtin/rebase: support running \"git rebase <upstream>\"","fromName":"Beat Bolli","fromEmail":"dev+git@drbeat.li","sentAt":"2018-07-21T12:49:52Z","receivedAt":"2018-07-21T12:52:10Z","isPatch":true,"sender":{"key":"dev+git@drbeat.li","avatar":"https://avatars.githubusercontent.com/u/21444?v=4"},"body":"The macro GIT_PATH_FUNC expands to a function definition that ends with\na closing brace. The extra semicolon produces a warning when compiling\nwith -pedantic.\n\nSigned-off-by: Beat Bolli <dev+git@drbeat.li>\n---\n\nJunio, this applies on top of pk/rebase-in-c.\n\nThanks, Beat\n\n builtin/rebase.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex e38ea80874..6aaae2436f 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -14,8 +14,8 @@\n #include \"refs.h\"\n #include \"quote.h\"\n \n-static GIT_PATH_FUNC(apply_dir, \"rebase-apply\");\n-static GIT_PATH_FUNC(merge_dir, \"rebase-merge\");\n+static GIT_PATH_FUNC(apply_dir, \"rebase-apply\")\n+static GIT_PATH_FUNC(merge_dir, \"rebase-merge\")\n \n enum rebase_type {\n \tREBASE_AM,\n-- \n2.18.0.203.gfac676dfb9\n\n"},{"id":"353286","messageId":"CAOZc8M_yXok6sPWw5CeptKTDsems4HAMWzNyRDTj9dCNivQ0SA@mail.gmail.com","threadId":"48931","inReplyTo":"20180721124952.26347-1-dev+git@drbeat.li","subject":"Re: [PATCH] fixup! builtin/rebase: support running \"git rebase <upstream>\"","fromName":"Pratik Karki","fromEmail":"predatoramigo@gmail.com","sentAt":"2018-07-22T04:51:53Z","receivedAt":"2018-07-22T04:52:07Z","isPatch":true,"sender":{"key":"predatoramigo@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12194950?v=4"},"body":"Hi,\n\nOn Sat, Jul 21, 2018 at 6:36 PM Beat Bolli <dev+git@drbeat.li> wrote:\n>\n> The macro GIT_PATH_FUNC expands to a function definition that ends with\n> a closing brace. The extra semicolon produces a warning when compiling\n> with -pedantic.\n>\n> Signed-off-by: Beat Bolli <dev+git@drbeat.li>\n> ---\n>\n> Junio, this applies on top of pk/rebase-in-c.\n>\n> Thanks, Beat\n>\n>  builtin/rebase.c | 4 ++--\n>  1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/builtin/rebase.c b/builtin/rebase.c\n> index e38ea80874..6aaae2436f 100644\n> --- a/builtin/rebase.c\n> +++ b/builtin/rebase.c\n> @@ -14,8 +14,8 @@\n>  #include \"refs.h\"\n>  #include \"quote.h\"\n>\n> -static GIT_PATH_FUNC(apply_dir, \"rebase-apply\");\n> -static GIT_PATH_FUNC(merge_dir, \"rebase-merge\");\n> +static GIT_PATH_FUNC(apply_dir, \"rebase-apply\")\n> +static GIT_PATH_FUNC(merge_dir, \"rebase-merge\")\n>\n\nFirst of all, I apologize for not replying earlier to your review.\nI have already fixed this macro in my local repository.\n\nThe new iteration of my patches was being held due to fixup of\n`detach_head_to()` and I will soon submit a new iteration of patch\nwithin a day or two.\nThank you for pointing this out.\n\nCheers,\nPratik Karki\n"}]}