Jonathan Nieder 4fb40c2b82 ll-merge: simplify opts == NULL case ...

As long as sizeof(struct ll_merge_options) is small, there is not
much reason not to keep a copy of the default merge options in the BSS
section.  In return, we get clearer code and one less stack frame in
the opts == NULL case.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2011-01-15 20:34:14 -08:00

10 KiB

Raw Blame History

View Raw