mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ll-merge: make flag easier to populate

Browse Source 
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>
This commit is contained in:
Jonathan Nieder
2010-08-05 06:17:38 -05:00
committed by Junio C Hamano
parent 24d113ec11
commit 73cf7f713d
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
merge-recursive.c
View File

@ -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);