Junio C Hamano <gitster@xxxxxxxxx> writes: > The variable "mode" is assigned to when we see an stage #2 entry in the > loop, and we should have updated threeway[1] immediately before doing so. > If threeway[1] is not updated, we would have already returned before using > the variable in make_cache_entry(). How can you be sure that ce_stage(ce) ever returns 2? Andreas. -- Andreas Schwab, schwab@xxxxxxxxxxxxxx GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- 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