diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2009-02-16 13:20:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-18 11:04:19 -0800 |
| commit | 7c4c97c0ac0cd66861d0c2b8bd7a47ed3c523ea7 (patch) | |
| tree | fc42dc10878370068d77dbbfb94cb2475561a0b1 /builtin-merge.c | |
| parent | 81d3fe9f4871e42ebd1af0221fa091fe5476e2f7 (diff) | |
| download | git-7c4c97c0ac0cd66861d0c2b8bd7a47ed3c523ea7.tar.gz git-7c4c97c0ac0cd66861d0c2b8bd7a47ed3c523ea7.tar.xz | |
Turn the flags in struct dir_struct into a single variable
By having flags represented as bits in the new member variable 'flags',
it will be easier to use parse_options when dir_struct is involved.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 6d2160d0a..4c119359e 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -636,7 +636,7 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote) memset(&opts, 0, sizeof(opts)); memset(&t, 0, sizeof(t)); memset(&dir, 0, sizeof(dir)); - dir.show_ignored = 1; + dir.flags |= DIR_SHOW_IGNORED; dir.exclude_per_dir = ".gitignore"; opts.dir = &dir; |