Skip to contentSkip to conversation

stash: add missing space to an error message

PATCH In review Kyle Meyer 2 participants 2 messages Nov 24, 2020

lore
Share & tools
lore

Kyle Meyer

author
#0 lore raw

PATCH 1/1 stash: add missing space to an error message

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

---
 builtin/stash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
builtin/stash.c +1 -1
index 24ddb1bffa..e1f8235fdd 100644
@@ -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

Signature · 1 line
2.29.2
#1 lore raw
Quoted 5 lines · Kyle Meyer

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

---

Makes sense. Thanks.

Quoted 18 lines
 builtin/stash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
builtin/stash.c +1 -1
index 24ddb1bffa..e1f8235fdd 100644
@@ -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