kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sb/submodule-rm-absorb' 

Error message fix.

* sb/submodule-rm-absorb:
  submodule.c: add missing ' in error messages
maint
Junio C Hamano 2017-04-19 21:37:17 -07:00
parent 7203bafa88 35ad44cbd8
commit a06380be54
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
submodule.c
View File

@ -1329,7 +1329,7 @@ int bad_to_remove_submodule(const char *path, unsigned flags)
cp.dir = path; cp.dir = path;
if (start_command(&cp)) { if (start_command(&cp)) {
if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR) if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
die(_("could not start 'git status in submodule '%s'"), die(_("could not start 'git status' in submodule '%s'"),
path); path);
ret = -1; ret = -1;
goto out; goto out;
@ -1342,7 +1342,7 @@ int bad_to_remove_submodule(const char *path, unsigned flags)


if (finish_command(&cp)) { if (finish_command(&cp)) {
if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR) if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
die(_("could not run 'git status in submodule '%s'"), die(_("could not run 'git status' in submodule '%s'"),
path); path);
ret = -1; ret = -1;
} }