Re: [PATCH v5 3/4] format-patch: introduce --base=auto option
- From
Ye Xiaolong <xiaolong.ye@intel.com>
- Date
- Apr 24, 2016, 04:32 UTC
- Message-ID
- <20160424043247.GB1258@yexl-desktop>
- In-Reply-To
- <xmqqk2jpnwc7.fsf@gitster.mtv.corp.google.com>
On Fri, Apr 22, 2016 at 02:54:16PM -0700, Junio C Hamano wrote:
Show 10 quoted lines
>Xiaolong Ye <xiaolong.ye@intel.com> 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.will fix it.
Thanks, Xiaolong.