On Wed, 19 Mar 2008, Linus Torvalds wrote:
>
> With the new unpack-trees logic it's pretty easy to *not* unpack with DF
> conflicts (add a flag that tells us to use "base_name_compare()" instead
> of "df_name_compare()" in do_compare_entry()), and maybe we can then make
> builtin-merge-recursive.c set that flag. [...]
Looking at that, the first thing we should probably do is to make those
existing flags be bitfields rather than "int" before we add even more
flags there.
Hmm?
Linus
---
unpack-trees.h | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/unpack-trees.h b/unpack-trees.h
index 50453ed..ad8cc65 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -9,16 +9,16 @@ typedef int (*merge_fn_t)(struct cache_entry **src,
struct unpack_trees_options *options);
struct unpack_trees_options {
- int reset;
- int merge;
- int update;
- int index_only;
- int nontrivial_merge;
- int trivial_merges_only;
- int verbose_update;
- int aggressive;
- int skip_unmerged;
- int gently;
+ unsigned int reset:1,
+ merge:1,
+ update:1,
+ index_only:1,
+ nontrivial_merge:1,
+ trivial_merges_only:1,
+ verbose_update:1,
+ aggressive:1,
+ skip_unmerged:1,
+ gently:1;
const char *prefix;
int pos;
struct dir_struct *dir;
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
