diff options
| author | Elijah Newren <newren@gmail.com> | 2023-02-27 15:28:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-27 16:29:51 (GMT) |
| commit | f297424a3a02b552865798ac8367cf657ef1df2d (patch) | |
| tree | 3e8f89037941300e2ef2b8c964df47e33deec71b /unpack-trees.h | |
| parent | 1ca13dd3ca6e153a2bc5b0b53555996cdd668e93 (diff) | |
| download | git-f297424a3a02b552865798ac8367cf657ef1df2d.zip git-f297424a3a02b552865798ac8367cf657ef1df2d.tar.gz git-f297424a3a02b552865798ac8367cf657ef1df2d.tar.bz2 | |
unpack-trees: add usage notices around df_conflict_entry
Avoid making users believe they need to initialize df_conflict_entry
to something (as happened with other output only fields before) with
a quick comment and a small sanity check.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.h')
| -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 e8737ad..61c06eb 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -78,7 +78,7 @@ struct unpack_trees_options { int head_idx; - struct cache_entry *df_conflict_entry; + struct cache_entry *df_conflict_entry; /* output only */ void *unpack_data; struct index_state *dst_index; |