diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 11:17:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-06 16:20:01 (GMT) |
| commit | 73cf7f713da4fc797e2393a9e490ad4ec9466c53 (patch) | |
| tree | 8d9c9fed8bfb98d0041ec9b4e8c125b5d4f26678 /merge-recursive.c | |
| parent | 24d113ec11d9948cedee4ba4687d0775e36b65f9 (diff) | |
| download | git-73cf7f713da4fc797e2393a9e490ad4ec9466c53.zip git-73cf7f713da4fc797e2393a9e490ad4ec9466c53.tar.gz git-73cf7f713da4fc797e2393a9e490ad4ec9466c53.tar.bz2 | |
ll-merge: make flag easier to populate
ll_merge() takes its options in a flag word, which has a few
advantages:
- options flags can be cheaply passed around in registers, while
an option struct passed by pointer cannot;
- callers can easily pass 0 without trouble for no options,
while an option struct passed by value would not allow that.
The downside is that code to populate and access the flag word can be
somewhat opaque. Mitigate that with a few macros.
Cc: Avery Pennarun <apenwarr@gmail.com>
Cc: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 8a49844..c0c9f0c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -647,7 +647,8 @@ static int merge_3way(struct merge_options *o, merge_status = ll_merge(result_buf, a->path, &orig, base_name, &src1, name1, &src2, name2, - (!!o->call_depth) | (favor << 1)); + ((o->call_depth ? LL_OPT_VIRTUAL_ANCESTOR : 0) | + create_ll_flag(favor))); free(name1); free(name2); |