On Wed, Jan 9, 2013 at 11:48 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Martin von Zweigbergk <martinvonz@xxxxxxxxx> writes: > >> Use a single condition to guard the call to die_if_unmerged_cache for >> both --soft and --keep. This avoids the small distraction of the >> precondition check from the logic following it. >> >> Also change an instance of >> >> if (e) >> err = err || f(); >> >> to the almost as short, but clearer >> >> if (e && !err) >> err = f(); >> >> (which is equivalent since we only care whether exit code is 0) > > It is not just equivalent, but should give us identical result, even > if we cared the actual value. If err is initially 0, and f() evaluates to 2, err would be 1 in the first case, but 2 in the second case, right? I think the two might be identical in e.g. JavaScript and Python, but I don't use either much. -- 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