Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
unpack-trees.c: align submodule error message to the other error messages
author
Stefan Beller
<sbeller@google.com>
Wed, 29 Mar 2017 22:34:24 +0000
(15:34 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 29 Mar 2017 22:47:36 +0000
(15:47 -0700)
As the place holder in the error message is for multiple submodules,
we don't want to encapsulate the string place holder in single quotes.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
unpack-trees.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
e1104a5
)
diff --git
a/unpack-trees.c
b/unpack-trees.c
index 8333da2cc908d7ea373e3d67fbf3ac6526d9019d..6b7356dab2a100f2c402af59c4207bfc291cd59d 100644
(file)
--- a/
unpack-trees.c
+++ b/
unpack-trees.c
@@
-167,7
+167,7
@@
void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
_("The following working tree files would be removed by sparse checkout update:\n%s");
msgs[ERROR_WOULD_LOSE_SUBMODULE] =
- _("
Submodule '%s' cannot checkout new HEAD
");
+ _("
Cannot update submodule:\n%s
");
opts->show_all_errors = 1;
/* rejected paths may not have a static buffer */