From f297424a3a02b552865798ac8367cf657ef1df2d Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 27 Feb 2023 15:28:20 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- unpack-trees.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unpack-trees.h') diff --git a/unpack-trees.h b/unpack-trees.h index e8737adfed..61c06eb7c5 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; -- cgit v1.2.3