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 /bundle.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 'bundle.c')
-rw-r--r-- | bundle.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -114,7 +114,7 @@ int verify_bundle(struct bundle_header *header, int verbose) continue; } if (++ret == 1) - error(message); + error("%s", message); error("%s %s", sha1_to_hex(e->sha1), e->name); } if (revs.pending.nr != p->nr) @@ -139,7 +139,7 @@ int verify_bundle(struct bundle_header *header, int verbose) for (i = 0; i < req_nr; i++) if (!(refs.objects[i].item->flags & SHOWN)) { if (++ret == 1) - error(message); + error("%s", message); error("%s %s", sha1_to_hex(refs.objects[i].item->sha1), refs.objects[i].name); } |