]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f4b6c6b) | patch
Remove unnecessary call_depth parameter in merge-recursive.
authorShawn O. Pearce <spearce@spearce.org>
Sun, 14 Jan 2007 05:28:33 +0000 (00:28 -0500)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 Jan 2007 20:20:39 +0000 (12:20 -0800)
commit63889639bbb47399b5ede784b1afe48679d52bb2
tree9d40d4a6e1f0765056d29e953ec4080dc74c7f6etree | snapshot
parentf4b6c6b90fdce12d69e4ad80ff6082405ec8cfb8commit | diff
Remove unnecessary call_depth parameter in merge-recursive.

Because the output_indent always matches the call_depth value
there is no reason to pass around the call_depth to the merge
function during each recursive invocation.

This is a simple refactoring that will make the code easier to
follow later on as I start to add output verbosity controls.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.