From 7a0e4d7c39083e951625e4c3434d05abfea8f5e6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 16 Jul 2010 12:08:24 -0700 Subject: [PATCH] diff A...B: do not limit the syntax too narrowly Earlier we tried to make sure that the trees we get are what A...B syntax produced, by checking that earlier ones are all marked uninteresting (which has to be true as they are merge bases), there are two remaining ones that are interesting, and they are marked as non-symmetric-left and symmetric-left respectively. The "the last two must be interesting" condition is however wrong when one is an ancestor of the other between A and B (i.e. fast-forward). In such a case, one of them is marked uninteresting. --- builtin-diff.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/builtin-diff.c b/builtin-diff.c index 62b483bd5f..192cbb212e 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -407,19 +407,6 @@ int cmd_diff(int argc, const char **argv, const char *prefix) result = builtin_diff_tree(&rev, argc, argv, ent); else if (ent[0].item->flags & UNINTERESTING) { /* - * Perhaps the user gave us A...B, which expands - * to a list of negative merge bases followed by - * A (symmetric-left) and B? Let's make sure... - */ - for (i = 1; i < ents; i++) - if (!(ent[i].item->flags & UNINTERESTING)) - break; - if (ents != i + 2 || - (ent[i+1].item->flags & UNINTERESTING) || - (!(ent[i].item->flags & SYMMETRIC_LEFT)) || - (ent[i+1].item->flags & SYMMETRIC_LEFT)) - die("what do you mean by that?"); - /* * diff A...B where there is at least one merge base * between A and B. We have ent[0] == merge-base, * ent[ents-2] == A, and ent[ents-1] == B. Show diff -- 2.11.4.GIT