git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Kyle Meyer <kyle@kyleam.com>
Date
Nov 24, 2020, 00:52 UTC
Message-ID
<20201124005212.13780-1-kyle@kyleam.com>

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
Next: Junio C Hamano
Message 1 of 2 in “stash: add missing space to an error message”
  1. stash: add missing space to an error messageKyle Meyer, Nov 24, 2020
  2. Junio C HamanoNov 24, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.