diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-11 14:46:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-11 14:49:50 -0800 |
| commit | 8bb4646dae89035695e72a39d6fe1c0f364ea0aa (patch) | |
| tree | 1bb31c78644ac1eb034212b97f3730733286ebae /unpack-trees.c | |
| parent | a9645b780b698703cd7dee25051d6ce39b0544c6 (diff) | |
| parent | 9db56f71b91153f4076a796c80c61f00edd8b700 (diff) | |
| download | git-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.tar.gz | |
Merge branch 'maint'
* maint:
Fix non-literal format in printf-style calls
git-submodule: Avoid printing a spurious message.
git ls-remote: make usage string match manpage
Makefile: help people who run 'make check' by mistake
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index e5749ef638..54f301da67 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -352,7 +352,7 @@ static int unpack_failed(struct unpack_trees_options *o, const char *message) discard_index(&o->result); if (!o->gently) { if (message) - return error(message); + return error("%s", message); return -1; } return -1; |