summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2010-06-11 17:02:50 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-11 13:46:25 -0700
commit3e333036ccbb97fddf54bd8fe74b12ba46f1687b (patch)
treeb3eeb160e80f92bec50e15b7c3d7e15cc612dbe9 /merge-recursive.c
parentEnable threaded async procedures whenever pthreads is available (diff)
downloadtgif-3e333036ccbb97fddf54bd8fe74b12ba46f1687b.tar.xz
fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
ebaa79f (Make report() from usage.c public as vreportf() and use it., 2010-03-06) changed fast-import's die_nicely() to use vreportf(). Unfortunately this is not possible: we need the message again for write_report(), and vreportf() uses vsnprintf(), which invalidates the va_list. As pointed out by Erik Faye-Lund, va_copy is C99 and thus not an option. So revert the part of ebaa79f that pertains to die_nicely(). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions