summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-21 13:14:47 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-09 01:22:25 -0700
commit75dc6c7cb879d0018893baf6ba6b49d1f16e1b92 (patch)
treeac0704c90aa7fb379e681f3a0f03acdd1c8942e4
parent2a5fe2545882721d6841bad11dae0f15b454bf0d (diff)
downloadgit-75dc6c7cb879d0018893baf6ba6b49d1f16e1b92.tar.gz
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>
-rw-r--r--unpack-trees.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 50453ed20f..ad8cc65d68 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;