range-diff/format-patch: handle commit ranges other than A..B
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, by parsing them via the revision machinery and 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@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
679b5916cd
commit
359f0d754a
26
range-diff.c
26
range-diff.c
@ -11,6 +11,7 @@
|
||||
#include "pretty.h"
|
||||
#include "userdiff.h"
|
||||
#include "apply.h"
|
||||
#include "revision.h"
|
||||
|
||||
struct patch_util {
|
||||
/* For the search for an exact match */
|
||||
@ -567,5 +568,28 @@ int show_range_diff(const char *range1, const char *range2,
|
||||
|
||||
int is_range_diff_range(const char *arg)
|
||||
{
|
||||
return !!strstr(arg, "..");
|
||||
char *copy = xstrdup(arg); /* setup_revisions() modifies it */
|
||||
const char *argv[] = { "", copy, "--", NULL };
|
||||
int i, positive = 0, negative = 0;
|
||||
struct rev_info revs;
|
||||
|
||||
init_revisions(&revs, NULL);
|
||||
if (setup_revisions(3, argv, &revs, NULL) == 1) {
|
||||
for (i = 0; i < revs.pending.nr; i++)
|
||||
if (revs.pending.objects[i].item->flags & UNINTERESTING)
|
||||
negative++;
|
||||
else
|
||||
positive++;
|
||||
for (i = 0; i < revs.pending.nr; i++) {
|
||||
struct object *obj = revs.pending.objects[i].item;
|
||||
|
||||
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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user