diff options
| author | Elijah Newren <newren@gmail.com> | 2021-09-27 18:33:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-27 22:38:37 +0200 |
| commit | c42e0b64093306d59372df288f9b4086290623f5 (patch) | |
| tree | e6901d355da3ac756b74d7ccfe3e6edd1e1cd902 /unpack-trees.h | |
| parent | unpack-trees: introduce preserve_ignored to unpack_trees_options (diff) | |
| download | git-c42e0b64093306d59372df288f9b4086290623f5.tar.xz git-c42e0b64093306d59372df288f9b4086290623f5.zip | |
unpack-trees: make dir an internal-only struct
Avoid accidental misuse or confusion over ownership by clearly making
unpack_trees_options.dir an internal-only variable.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | unpack-trees.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index f98cfd49d7..61da25dafe 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -67,7 +67,6 @@ struct unpack_trees_options { dry_run; const char *prefix; int cache_bottom; - struct dir_struct *dir; struct pathspec *pathspec; merge_fn_t fn; const char *msgs[NB_UNPACK_TREES_WARNING_TYPES]; @@ -89,6 +88,7 @@ struct unpack_trees_options { struct index_state result; struct pattern_list *pl; /* for internal use */ + struct dir_struct *dir; /* for internal use only */ struct checkout_metadata meta; }; |