Re: [PATCH v5 3/4] format-patch: introduce --base=auto option
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 22, 2016, 21:54 UTC
- Message-ID
- <xmqqk2jpnwc7.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <1461303756-25975-4-git-send-email-xiaolong.ye@intel.com>
Xiaolong Ye <xiaolong.ye@intel.com> writes:
Show 6 quoted lines
> + 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.