summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-11 22:46:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-11-11 22:49:50 (GMT)
commit8bb4646dae89035695e72a39d6fe1c0f364ea0aa (patch)
tree1bb31c78644ac1eb034212b97f3730733286ebae /unpack-trees.c
parenta9645b780b698703cd7dee25051d6ce39b0544c6 (diff)
parent9db56f71b91153f4076a796c80c61f00edd8b700 (diff)
downloadgit-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.zip
git-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.tar.gz
git-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index e5749ef..54f301d 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;