Make unpack_trees_options bit flags actual bitfields
Instead of wasting space with whole integers for a single bit. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2a5fe25458
commit
75dc6c7cb8
@ -9,16 +9,16 @@ typedef int (*merge_fn_t)(struct cache_entry **src,
|
|||||||
struct unpack_trees_options *options);
|
struct unpack_trees_options *options);
|
||||||
|
|
||||||
struct unpack_trees_options {
|
struct unpack_trees_options {
|
||||||
int reset;
|
unsigned int reset:1,
|
||||||
int merge;
|
merge:1,
|
||||||
int update;
|
update:1,
|
||||||
int index_only;
|
index_only:1,
|
||||||
int nontrivial_merge;
|
nontrivial_merge:1,
|
||||||
int trivial_merges_only;
|
trivial_merges_only:1,
|
||||||
int verbose_update;
|
verbose_update:1,
|
||||||
int aggressive;
|
aggressive:1,
|
||||||
int skip_unmerged;
|
skip_unmerged:1,
|
||||||
int gently;
|
gently:1;
|
||||||
const char *prefix;
|
const char *prefix;
|
||||||
int pos;
|
int pos;
|
||||||
struct dir_struct *dir;
|
struct dir_struct *dir;
|
||||||
|
Loading…
Reference in New Issue
Block a user