summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-01-15 19:08:42 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-01-15 20:34:14 -0800
commit4fb40c2b8206f7bdffedd8d58d2f9c031227b01b (patch)
tree1a14bbf5c9369ebe428dc09ba0677bf1642c3ea8 /environment.c
parentGit 1.7.4-rc2 (diff)
downloadtgif-4fb40c2b8206f7bdffedd8d58d2f9c031227b01b.tar.xz
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 'environment.c')
0 files changed, 0 insertions, 0 deletions