diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:41 -0800 |
| commit | 77348b0e6e350ec81b3880f99c6077d165df2276 (patch) | |
| tree | 19833dbe1ebf5b5300a0a1cc4bc9c8f136b8b617 /builtin/log.c | |
| parent | 69571dfe219f48614e0e0ae7e28efae0be297764 (diff) | |
| parent | 2cc543deab38c188906c41e537dc5c7de98b93d7 (diff) | |
| download | git-77348b0e6e350ec81b3880f99c6077d165df2276.tar.gz | |
Merge branch 'js/range-diff-wo-dotdot'
There are other ways than ".." for a single token to denote a
"commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
range-diff" did not understand them.
* js/range-diff-wo-dotdot:
range-diff(docs): explain how to specify commit ranges
range-diff/format-patch: handle commit ranges other than A..B
range-diff/format-patch: refactor check for commit range
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index d0cbaaf68a..a00da91a1f 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1672,7 +1672,7 @@ 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, ".."); + int prev_is_range = is_range_diff_range(prev); if (prev_is_range) strbuf_addstr(r1, prev); |