diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-01-27 16:37:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-28 06:01:49 (GMT) |
| commit | 679b5916cdafdcfa9fb36c31dbf53d7e4aa0af0b (patch) | |
| tree | d3ad427618e272cc05cc4c8924f0ff3114612d04 /builtin | |
| parent | 66e871b6647ffea61a77a0f82c7ef3415f1ee79c (diff) | |
| download | git-679b5916cdafdcfa9fb36c31dbf53d7e4aa0af0b.zip git-679b5916cdafdcfa9fb36c31dbf53d7e4aa0af0b.tar.gz git-679b5916cdafdcfa9fb36c31dbf53d7e4aa0af0b.tar.bz2 | |
range-diff/format-patch: refactor check for commit range
Currently, when called with exactly two arguments, `git range-diff`
tests for a literal `..` in each of the two. Likewise, the argument
provided via `--range-diff` to `git format-patch` is checked in the same
manner.
However, `<commit>^!` is a perfectly valid commit range, equivalent to
`<commit>^..<commit>` according to the `SPECIFYING RANGES` section of
gitrevisions[7].
In preparation for allowing more sophisticated ways to specify commit
ranges, let's refactor the check into its own function.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 2 | ||||
| -rw-r--r-- | builtin/range-diff.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/builtin/log.c b/builtin/log.c index f23ccdb..91466c0 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1680,7 +1680,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); diff --git a/builtin/range-diff.c b/builtin/range-diff.c index 24c4162..5b1f632 100644 --- a/builtin/range-diff.c +++ b/builtin/range-diff.c @@ -3,6 +3,7 @@ #include "parse-options.h" #include "range-diff.h" #include "config.h" +#include "revision.h" static const char * const builtin_range_diff_usage[] = { N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"), @@ -46,12 +47,12 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix) diffopt.use_color = 1; if (argc == 2) { - if (!strstr(argv[0], "..")) - die(_("no .. in range: '%s'"), argv[0]); + if (!is_range_diff_range(argv[0])) + die(_("not a commit range: '%s'"), argv[0]); strbuf_addstr(&range1, argv[0]); - if (!strstr(argv[1], "..")) - die(_("no .. in range: '%s'"), argv[1]); + if (!is_range_diff_range(argv[1])) + die(_("not a commit range: '%s'"), argv[1]); strbuf_addstr(&range2, argv[1]); } else if (argc == 3) { strbuf_addf(&range1, "%s..%s", argv[0], argv[1]); |