Xiaolong Ye <xiaolong.ye@xxxxxxxxx> writes: > + if (upstream) { > + unsigned char sha1[20]; > + if (get_sha1(upstream, sha1)) > + die(_("Failed to resolve '%s' as a valid ref."), upstream); > + struct commit *commit = lookup_commit_or_die(sha1, "upstream base"); > + struct commit_list *base_list = get_merge_bases_many(commit, total, list); This introduces decl-after-statement. -- 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