| commit | 4fb40c2b8206f7bdffedd8d58d2f9c031227b01b | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Sun, 16 Jan 2011 01:08:42 +0000 (15 19:08 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 16 Jan 2011 04:34:14 +0000 (15 20:34 -0800) | ||
| tree | 1a14bbf5c9369ebe428dc09ba0677bf1642c3ea8 | treesnapshot (tar.gz zip) |
| parent | adf872e7837cc92e390f00ee32f32c5639d3a444 | commitdiff |
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>
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>
| ll-merge.c | diffblobblamehistory |