Skip to content

Commit

Permalink
merge-recursive: get rid of the index_only global variable
Browse files Browse the repository at this point in the history
struct merge_options already has a call_depth member, and index_only
global variable always equals to !!call_depth.

We always use index_only as a condition, so we can just
use call_depth instead of index_only.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
  • Loading branch information
Miklos Vajna authored and Junio C Hamano committed Sep 5, 2008
1 parent 5033639 commit b7fa51d
Showing 1 changed file with 67 additions and 73 deletions.
Loading

0 comments on commit b7fa51d

Please sign in to comment.