"Glen Choo via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > @@ -125,19 +115,9 @@ static inline struct config_source *config_reader_pop_source(struct config_reade > static inline void config_reader_set_kvi(struct config_reader *reader, > struct key_value_info *kvi) > { > - if (kvi && (reader->source || reader->parsing_scope)) > - BUG("kvi should not be set while parsing a config source"); > reader->config_kvi = kvi; > } > We're removing this check now because reader->parsing_scope is removed in this patch. Makes sense (no reason to just remove the reader->parsing_scope first and then remove the whole check later). Rest of the patch looks good too.