{"thread":{"id":"49923","subject":"[PATCH] builtin/rebase.c: remove superfluous space in messages","startedAt":"2018-11-30T18:11:51Z","lastAt":"2018-11-30T18:52:20Z","messageCount":2,"participants":["Ralf Thielow","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"364403","messageId":"20181130181145.13539-1-ralf.thielow@gmail.com","threadId":"49923","inReplyTo":null,"subject":"[PATCH] builtin/rebase.c: remove superfluous space in messages","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2018-11-30T18:11:45Z","receivedAt":"2018-11-30T18:11:51Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>\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 5b3e5baec8..a6acba76b4 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -871,7 +871,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\t\t       \"them\"), REBASE_PRESERVE_MERGES),\n \t\tOPT_BOOL(0, \"rerere-autoupdate\",\n \t\t\t &options.allow_rerere_autoupdate,\n-\t\t\t N_(\"allow rerere to update index  with resolved \"\n+\t\t\t N_(\"allow rerere to update index with resolved \"\n \t\t\t    \"conflict\")),\n \t\tOPT_BOOL('k', \"keep-empty\", &options.keep_empty,\n \t\t\t N_(\"preserve empty commits during rebase\")),\n@@ -1520,7 +1520,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t */\n \tstrbuf_reset(&msg);\n \tif (!oidcmp(&merge_base, &options.orig_head)) {\n-\t\tprintf(_(\"Fast-forwarded %s to %s. \\n\"),\n+\t\tprintf(_(\"Fast-forwarded %s to %s.\\n\"),\n \t\t\tbranch_name, options.onto_name);\n \t\tstrbuf_addf(&msg, \"rebase finished: %s onto %s\",\n \t\t\toptions.head_name ? options.head_name : \"detached HEAD\",\n-- \n2.20.0.rc1.379.g1dd7ef354c\n\n"},{"id":"364404","messageId":"nycvar.QRO.7.76.6.1811301951190.41@tvgsbejvaqbjf.bet","threadId":"49923","inReplyTo":"20181130181145.13539-1-ralf.thielow@gmail.com","subject":"Re: [PATCH] builtin/rebase.c: remove superfluous space in messages","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-11-30T18:52:14Z","receivedAt":"2018-11-30T18:52:20Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Ralf,\n\nOn Fri, 30 Nov 2018, Ralf Thielow wrote:\n\n> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n\nACK.\n\nThe commit message could state that the scripted rebase does not have\nthose whitespace issues, and that this aligns the built-in rebase with it,\nbut I won't insist.\n\nCiao,\nJohannes\n\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 5b3e5baec8..a6acba76b4 100644\n> --- a/builtin/rebase.c\n> +++ b/builtin/rebase.c\n> @@ -871,7 +871,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n>  \t\t\t       \"them\"), REBASE_PRESERVE_MERGES),\n>  \t\tOPT_BOOL(0, \"rerere-autoupdate\",\n>  \t\t\t &options.allow_rerere_autoupdate,\n> -\t\t\t N_(\"allow rerere to update index  with resolved \"\n> +\t\t\t N_(\"allow rerere to update index with resolved \"\n>  \t\t\t    \"conflict\")),\n>  \t\tOPT_BOOL('k', \"keep-empty\", &options.keep_empty,\n>  \t\t\t N_(\"preserve empty commits during rebase\")),\n> @@ -1520,7 +1520,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n>  \t */\n>  \tstrbuf_reset(&msg);\n>  \tif (!oidcmp(&merge_base, &options.orig_head)) {\n> -\t\tprintf(_(\"Fast-forwarded %s to %s. \\n\"),\n> +\t\tprintf(_(\"Fast-forwarded %s to %s.\\n\"),\n>  \t\t\tbranch_name, options.onto_name);\n>  \t\tstrbuf_addf(&msg, \"rebase finished: %s onto %s\",\n>  \t\t\toptions.head_name ? options.head_name : \"detached HEAD\",\n> -- \n> 2.20.0.rc1.379.g1dd7ef354c\n> \n> \n"}]}