]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: adf872e) | patch
ll-merge: simplify opts == NULL case
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 16 Jan 2011 01:08:42 +0000 (19:08 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Jan 2011 04:34:14 +0000 (20:34 -0800)
commit4fb40c2b8206f7bdffedd8d58d2f9c031227b01b
tree1a14bbf5c9369ebe428dc09ba0677bf1642c3ea8tree | snapshot
parentadf872e7837cc92e390f00ee32f32c5639d3a444commit | diff
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>
ll-merge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.