diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2020-09-08 07:16:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-08 22:03:27 (GMT) |
| commit | 07a7f8debfa43bd28537f475925776a92c30a678 (patch) | |
| tree | a65732a72d0b926af174973905e5372ecd98454b | |
| parent | 72a7239016fa4c8919a8b6932ad76e5f820389eb (diff) | |
| download | git-07a7f8debfa43bd28537f475925776a92c30a678.zip git-07a7f8debfa43bd28537f475925776a92c30a678.tar.gz git-07a7f8debfa43bd28537f475925776a92c30a678.tar.bz2 | |
format-patch: use 'origin' as start of current-series-range when known
When formatting a patch series over `origin..HEAD`, one would expect
that range to be used as the current-series-range when computing a
range-diff between the previous and current versions of a patch series.
However, infer_range_diff_ranges() ignores `origin..HEAD` when
--range-diff=<prev> specifies a single revision rather than a range, and
instead unexpectedly computes the current-series-range based upon
<prev>. Address this anomaly by unconditionally using `origin..HEAD` as
the current-series-range regardless of <prev> as long as `origin` is
known, and only fall back to basing current-series-range on <prev> when
`origin` is not known.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/log.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/builtin/log.c b/builtin/log.c index 37177b3..f79b2b8 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1595,16 +1595,20 @@ static void infer_range_diff_ranges(struct strbuf *r1, struct commit *head) { const char *head_oid = oid_to_hex(&head->object.oid); + int prev_is_range = !!strstr(prev, ".."); - if (!strstr(prev, "..")) { + if (prev_is_range) + strbuf_addstr(r1, prev); + else strbuf_addf(r1, "%s..%s", head_oid, prev); + + if (origin) + strbuf_addf(r2, "%s..%s", oid_to_hex(&origin->object.oid), head_oid); + else if (prev_is_range) + die(_("failed to infer range-diff origin of current series")); + else { + warning(_("using '%s' as range-diff origin of current series"), prev); strbuf_addf(r2, "%s..%s", prev, head_oid); - } else if (!origin) { - die(_("failed to infer range-diff ranges")); - } else { - strbuf_addstr(r1, prev); - strbuf_addf(r2, "%s..%s", - oid_to_hex(&origin->object.oid), head_oid); } } |