summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Nicolas Pitre <nico@cam.org>2007-10-30 14:57:33 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-10-30 16:08:40 -0700
commit4d4fcc5451d9d653bebcc8afa18543cb426abeed (patch)
tree4cf86181f94c46f0c56317132ac42dd403c71674 /merge-tree.c
parentmake struct progress an opaque type (diff)
downloadtgif-4d4fcc5451d9d653bebcc8afa18543cb426abeed.tar.xz
relax usage of the progress API
Since it is now OK to pass a null pointer to display_progress() and stop_progress() resulting in a no-op, then we can simplify the code and remove a bunch of lines by not making those calls conditional all the time. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions