[PATCH v2 2/3] range-diff/format-patch: handle commit ranges other than A..B
flat view
STALE2085d
SUPERSEDED
From: Johannes Schindelin via GitGitGadget <hidden>
Date: 2021-01-22 18:41:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 6 in this series.
Revisions (6)
From: Johannes Schindelin <redacted> In the `SPECIFYING RANGES` section of gitrevisions[7], two ways are described to specify commit ranges that `range-diff` does not yet accept: "<commit>^!" and "<commit>^-<n>". Let's accept them. Signed-off-by: Johannes Schindelin <redacted> --- revision.c | 22 +++++++++++++++++++++- t/t3206-range-diff.sh | 8 ++++++++ 2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/revision.c b/revision.c
index 00675f598a3..9ee063a2c03 100644
--- a/revision.c
+++ b/revision.c@@ -4209,5 +4209,25 @@ void put_revision_mark(const struct rev_info *revs, const struct commit *commit) int specifies_commit_range(const char *range) { - return !!strstr(range, ".."); + size_t i; + char c; + + if (strstr(range, "..")) + return 1; + + i = strlen(range); + c = i > 2 ? range[--i] : 0; + if (c == '!') + i--; /* might be ...^! */ + else if (isdigit(c)) { + /* handle ...^-<n> */ + while (i > 2 && isdigit(range[--i])) + ; /* keep trimming trailing digits */ + if (i < 2 || range[i--] != '-') + return 0; + } else + return 0; + + /* Before the `!` or the `-<n>`, we expect `<rev>^` */ + return i > 0 && range[i] == '^'; }
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index 6eb344be031..e217cecac9e 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh@@ -150,6 +150,14 @@ test_expect_success 'simple A B C (unmodified)' ' test_cmp expect actual ' +test_expect_success 'A^! and A^-<n> (unmodified)' ' + git range-diff --no-color topic^! unmodified^-1 >actual && + cat >expect <<-EOF && + 1: $(test_oid t4) = 1: $(test_oid u4) s/12/B/ + EOF + test_cmp expect actual +' + test_expect_success 'trivial reordering' ' git range-diff --no-color master topic reordered >actual && cat >expect <<-EOF &&
--
gitgitgadget