diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-04-19 21:37:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-19 21:37:17 -0700 |
| commit | a06380be54c877241a02cf057d7bf20c958224be (patch) | |
| tree | c5ebb002943295ad6c9f89c2bd8284f260508ae3 | |
| parent | Merge branch 'ah/diff-files-ours-theirs-doc' (diff) | |
| parent | submodule.c: add missing ' in error messages (diff) | |
| download | tgif-a06380be54c877241a02cf057d7bf20c958224be.tar.xz | |
Merge branch 'sb/submodule-rm-absorb'
Error message fix.
* sb/submodule-rm-absorb:
submodule.c: add missing ' in error messages
| -rw-r--r-- | submodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index cdbecfbeaf..620504d325 100644 --- a/submodule.c +++ b/submodule.c @@ -1329,7 +1329,7 @@ int bad_to_remove_submodule(const char *path, unsigned flags) cp.dir = path; if (start_command(&cp)) { 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); ret = -1; goto out; @@ -1342,7 +1342,7 @@ int bad_to_remove_submodule(const char *path, unsigned flags) if (finish_command(&cp)) { 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); ret = -1; } |