aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-01-14 00:28:53 -0500
committerJunio C Hamano <junkio@cox.net>2007-01-14 12:20:39 -0800
commit66a155bc129b12f1f13be8e3f20e57db5ace0e6f (patch)
treedcef6e29723162fee4e7e7fde02d0ee045deb0bc /unpack-trees.c
parent8c3275abcacb83ea3f4c4f4ceb2376799fc282bd (diff)
downloadgit-66a155bc129b12f1f13be8e3f20e57db5ace0e6f.tar.gz
git-66a155bc129b12f1f13be8e3f20e57db5ace0e6f.tar.xz
Enable output buffering in merge-recursive.
Buffering all message output until a merge invocation is complete is necessary to prevent intereferring with a progress meter that would indicate the number of files completely merged, and how many remain. This change does not introduce a progress meter, but merely lays the groundwork to buffer the output. To aid debugging output buffering is only enabled if verbosity is lower than 5. When using verbosity levels above 5 the user is probably debugging the merge program itself and does not want to see the output delayed, especially if they are stepping through portions of the code in a debugger. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'unpack-trees.c')
0 files changed, 0 insertions, 0 deletions