Tanay Abhra <tanayabh@xxxxxxxxx> writes: > +static int configset_iter(struct config_set *cs, config_fn_t fn, void *data) > +{ > + int i; > + struct string_list *strptr; > + struct config_set_element *entry; > + struct hashmap_iter iter; > + hashmap_iter_init(&cs->config_hash, &iter); > + while ((entry = hashmap_iter_next(&iter))) { > + strptr = &entry->value_list; > + for (i = 0; i < strptr->nr; i++) { > + if (fn(entry->key, strptr->items[i].string, data) < 0) > + die("bad config file line in (TODO: file/line info)"); One more reason to reorder (but that will actually be slightly more than "rebase -i", you'll have a few conflicts to fix) is to avoid this TODO. Put the patch after the line number patch and you'll be able to provide the right information directly. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html