diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-01-15 19:08:42 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-15 20:34:14 -0800 |
| commit | 4fb40c2b8206f7bdffedd8d58d2f9c031227b01b (patch) | |
| tree | 1a14bbf5c9369ebe428dc09ba0677bf1642c3ea8 /sha1_file.c | |
| parent | adf872e7837cc92e390f00ee32f32c5639d3a444 (diff) | |
| download | git-4fb40c2b8206f7bdffedd8d58d2f9c031227b01b.tar.gz | |
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>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions