undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ll-merge: simplify opts == NULL case

Browse Source 
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>
This commit is contained in:
Jonathan Nieder 2011-01-15 19:08:42 -06:00 committed by Junio C Hamano
parent adf872e783
commit 4fb40c2b82
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ll-merge.c
View File

@ -351,16 +351,13 @@ int ll_merge(mmbuffer_t *result_buf,
const struct ll_merge_options *opts) const struct ll_merge_options *opts)
{ {
static struct git_attr_check check[2]; static struct git_attr_check check[2];
static const struct ll_merge_options default_opts;
const char *ll_driver_name = NULL; const char *ll_driver_name = NULL;
int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
const struct ll_merge_driver *driver; const struct ll_merge_driver *driver;
if (!opts) { if (!opts)
struct ll_merge_options default_opts = {0}; opts = &default_opts;
return ll_merge(result_buf, path, ancestor, ancestor_label,
ours, our_label, theirs, their_label,
&default_opts);
}
if (opts->renormalize) { if (opts->renormalize) {
normalize_file(ancestor, path); normalize_file(ancestor, path);