diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2020-09-08 10:16:10 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-09 01:03:27 +0300 |
| commit | 07a7f8debfa43bd28537f475925776a92c30a678 (patch) | |
| tree | a65732a72d0b926af174973905e5372ecd98454b /diff-lib.c | |
| parent | 72a7239016fa4c8919a8b6932ad76e5f820389eb (diff) | |
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>
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions