{"thread":{"id":"54698","subject":"[PATCH] stash: add missing space to an error message","startedAt":"2020-11-24T00:53:06Z","lastAt":"2020-11-24T20:56:14Z","messageCount":2,"participants":["Kyle Meyer","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"410610","messageId":"20201124005212.13780-1-kyle@kyleam.com","threadId":"54698","inReplyTo":null,"subject":"[PATCH] stash: add missing space to an error message","fromName":"Kyle Meyer","fromEmail":"kyle@kyleam.com","sentAt":"2020-11-24T00:52:12Z","receivedAt":"2020-11-24T00:53:06Z","isPatch":true,"sender":{"key":"kyle@kyleam.com","avatar":"https://avatars.githubusercontent.com/u/1297788?v=4"},"body":"Restore a space that was lost in 8a0fc8d19d (stash: convert apply to\nbuiltin, 2019-02-25).\n\nSigned-off-by: Kyle Meyer <kyle@kyleam.com>\n---\n builtin/stash.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/stash.c b/builtin/stash.c\nindex 24ddb1bffa..e1f8235fdd 100644\n--- a/builtin/stash.c\n+++ b/builtin/stash.c\n@@ -419,7 +419,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,\n \t\t\tret = apply_cached(&out);\n \t\t\tstrbuf_release(&out);\n \t\t\tif (ret)\n-\t\t\t\treturn error(_(\"conflicts in index.\"\n+\t\t\t\treturn error(_(\"conflicts in index. \"\n \t\t\t\t\t       \"Try without --index.\"));\n \n \t\t\tdiscard_cache();\n\nbase-commit: b291b0a628020eedb10b6236d87fe25d295cea81\n-- \n2.29.2\n\n"},{"id":"410706","messageId":"xmqq4klejwyy.fsf@gitster.c.googlers.com","threadId":"54698","inReplyTo":"20201124005212.13780-1-kyle@kyleam.com","subject":"Re: [PATCH] stash: add missing space to an error message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-11-24T20:55:49Z","receivedAt":"2020-11-24T20:56:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Kyle Meyer <kyle@kyleam.com> writes:\n\n> Restore a space that was lost in 8a0fc8d19d (stash: convert apply to\n> builtin, 2019-02-25).\n>\n> Signed-off-by: Kyle Meyer <kyle@kyleam.com>\n> ---\n\nMakes sense.  Thanks.\n\n>  builtin/stash.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/stash.c b/builtin/stash.c\n> index 24ddb1bffa..e1f8235fdd 100644\n> --- a/builtin/stash.c\n> +++ b/builtin/stash.c\n> @@ -419,7 +419,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,\n>  \t\t\tret = apply_cached(&out);\n>  \t\t\tstrbuf_release(&out);\n>  \t\t\tif (ret)\n> -\t\t\t\treturn error(_(\"conflicts in index.\"\n> +\t\t\t\treturn error(_(\"conflicts in index. \"\n>  \t\t\t\t\t       \"Try without --index.\"));\n>  \n>  \t\t\tdiscard_cache();\n>\n> base-commit: b291b0a628020eedb10b6236d87fe25d295cea81\n"}]}