In https://lore.kernel.org/git/20200306091933.mx2jmurmdnsjua4b@xxxxxxxxxxxxxx/, it was reported that git range-diff does not handle commit ranges like rev^!. This patch series fixes that. Changes since v4: * The commit marks are now cleared in is_range_diff_range(). * A regression test now verifies that HEAD^{/something..or other} isn't mistaken for a commit range. * The manual page no longer mentions "symmetric range", to avoid contentious language. Changes since v3: * The revision machinery is now used directly to validate the commit ranges. Changes since v2: * Move the helper function from revision.c to range-diff.c and rename it. * Use a regex to make it easier to understand what we're trying to match. * Fix the documentation that claimed that we used git merge-base internally when git range-diff parses ...-style arguments, which is not the case. Changes since v1: * In addition to git range-diff, git format-patch --range-diff gets the same improvement. * The comment talking about ^@ was removed. * The parsing was made a bit safer (e.g. catching ! by its own as an invalid range). Johannes Schindelin (3): range-diff/format-patch: refactor check for commit range range-diff/format-patch: handle commit ranges other than A..B range-diff(docs): explain how to specify commit ranges Documentation/git-range-diff.txt | 11 +++++++++++ builtin/log.c | 2 +- builtin/range-diff.c | 9 +++++---- range-diff.c | 27 +++++++++++++++++++++++++++ range-diff.h | 6 ++++++ t/t3206-range-diff.sh | 13 +++++++++++++ 6 files changed, 63 insertions(+), 5 deletions(-) base-commit: 71ca53e8125e36efbda17293c50027d31681a41f Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-841%2Fdscho%2Frange-diff-with-ranges-lacking-dotdot-v5 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-841/dscho/range-diff-with-ranges-lacking-dotdot-v5 Pull-Request: https://github.com/gitgitgadget/git/pull/841 Range-diff vs v4: 1: b98fa94b8703 = 1: b98fa94b8703 range-diff/format-patch: refactor check for commit range 2: 448e6a64fa15 ! 2: 04b5d75adbc3 range-diff/format-patch: handle commit ranges other than A..B @@ Commit message looking for at least one interesting and one uninteresting revision in the resulting `pending` array. + This also finally lets us reject arguments that _do_ contain `..` but + are not actually ranges, e.g. `HEAD^{/do.. match this}`. + Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> ## range-diff.c ## @@ range-diff.c: int show_range_diff(const char *range1, const char *range2, + struct rev_info revs; + + init_revisions(&revs, NULL); -+ if (setup_revisions(3, argv, &revs, 0) == 1) { -+ for (i = 0; i < revs.pending.nr; i++) -+ if (revs.pending.objects[i].item->flags & UNINTERESTING) ++ if (setup_revisions(3, argv, &revs, 0) == 1) ++ for (i = 0; i < revs.pending.nr; i++) { ++ struct object *obj = revs.pending.objects[i].item; ++ ++ if (obj->flags & UNINTERESTING) + negative++; + else + positive++; -+ } ++ if (obj->type == OBJ_COMMIT) ++ clear_commit_marks((struct commit *)obj, ++ ALL_REV_FLAGS); ++ } + + free(copy); + object_array_clear(&revs.pending); + return negative > 0 && positive > 0; } + ## range-diff.h ## +@@ range-diff.h: int show_range_diff(const char *range1, const char *range2, + + /* + * Determine whether the given argument is usable as a range argument of `git +- * range-diff`, e.g. A..B. Note that this only validates the format but does +- * _not_ parse it, i.e. it does _not_ look up the specified commits in the +- * local repository. ++ * range-diff`, e.g. A..B. + */ + int is_range_diff_range(const char *arg); + + ## t/t3206-range-diff.sh ## @@ t/t3206-range-diff.sh: test_expect_success 'simple A B C (unmodified)' ' test_cmp expect actual @@ t/t3206-range-diff.sh: test_expect_success 'simple A B C (unmodified)' ' + EOF + test_cmp expect actual +' ++ ++test_expect_success 'A^{/..} is not mistaken for a range' ' ++ test_must_fail git range-diff topic^.. topic^{/..} 2>error && ++ test_i18ngrep "not a commit rang" error ++' + test_expect_success 'trivial reordering' ' git range-diff --no-color master topic reordered >actual && 3: 295fdc1cd32c ! 3: bc5de807735d range-diff(docs): explain how to specify commit ranges @@ Documentation/git-range-diff.txt: Finally, the list of matching commits is shown + `<base>..<rev>`, `<rev>^!` or `<rev>^-<n>`. See `SPECIFYING RANGES` + in linkgit:gitrevisions[7] for more details. + -+- `<rev1>...<rev2>`. This resembles the symmetric ranges mentioned in -+ the `SPECIFYING RANGES` section of linkgit:gitrevisions[7], and is -+ equivalent to `<rev2>..<rev1> <rev1>..<rev2>`. ++- `<rev1>...<rev2>`. This is equivalent to ++ `<rev2>..<rev1> <rev1>..<rev2>`. + +- `<base> <rev1> <rev2>`: This is equivalent to `<base>..<rev1> + <base>..<rev2>`. -- gitgitgadget
