* [PATCH] stash: add missing space to an error message
@ 2020-11-24 0:52 Kyle Meyer
2020-11-24 20:55 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Kyle Meyer @ 2020-11-24 0:52 UTC (permalink / raw)
To: git
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] stash: add missing space to an error message
2020-11-24 0:52 [PATCH] stash: add missing space to an error message Kyle Meyer
@ 2020-11-24 20:55 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2020-11-24 20:55 UTC (permalink / raw)
To: Kyle Meyer; +Cc: git
Kyle Meyer <kyle@kyleam.com> writes:
> 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.
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-24 22:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-24 0:52 [PATCH] stash: add missing space to an error message Kyle Meyer
2020-11-24 20:55 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).