From: Junio C Hamano Date: Fri, 22 Apr 2016 21:54:16 GMT Subject: Re: [PATCH v5 3/4] format-patch: introduce --base=auto option Message-ID: In-Reply-To: <1461303756-25975-4-git-send-email-xiaolong.ye@intel.com> Xiaolong Ye 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.