threads / patch / 54698

patchstash: add missing space to an error message

Subject: [PATCH] stash: add missing space to an error message

## tl;dr

2 messages between Nov 24, 2020 and Nov 24, 2020. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Kyle Meyer· Nov 24, 2020, 00:52 UTC · lore

Restore a space that was lost in 8a0fc8d19d (stash: convert apply to builtin, 2019-02-25).

Signed-off-by: Kyle Meyer <kyle@kyleam.com>
---
 builtin/stash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to builtin/stash.c +1 −1

diff --git a/builtin/stash.c b/builtin/stash.c
index 24ddb1bffa..e1f8235fdd 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -419,7 +419,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 			ret = apply_cached(&out);
 			strbuf_release(&out);
 			if (ret)
-				return error(_("conflicts in index."
+				return error(_("conflicts in index. "
 					       "Try without --index."));
 
 			discard_cache();

base-commit: b291b0a628020eedb10b6236d87fe25d295cea81

-- 
2.29.2

Junio C Hamano· Nov 24, 2020, 20:55 UTC · re: Kyle Meyer · lore

Re: [PATCH] stash: add missing space to an error message

Kyle Meyer <kyle@kyleam.com> writes:

Show 5 quoted lines

> Restore a space that was lost in 8a0fc8d19d (stash: convert apply to
> builtin, 2019-02-25).
>
> Signed-off-by: Kyle Meyer <kyle@kyleam.com>
> ---

Makes sense.  Thanks.

Show 18 quoted lines

>  builtin/stash.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/stash.c b/builtin/stash.c
> index 24ddb1bffa..e1f8235fdd 100644
> --- a/builtin/stash.c
> +++ b/builtin/stash.c
> @@ -419,7 +419,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
>  			ret = apply_cached(&out);
>  			strbuf_release(&out);
>  			if (ret)
> -				return error(_("conflicts in index."
> +				return error(_("conflicts in index. "
>  					       "Try without --index."));
>  
>  			discard_cache();
>
> base-commit: b291b0a628020eedb10b6236d87fe25d295cea81