diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-16 15:45:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-16 15:45:35 -0700 |
| commit | 24e7a5be373c95f977bab4f0f41f736bb1d25075 (patch) | |
| tree | 815dbc4e0bb0d528ed9a7e53394b0ffe5b198e84 | |
| parent | Only run aggregate-results over actual counts (diff) | |
| parent | diff A...B: do not limit the syntax too narrowly (diff) | |
| download | tgif-24e7a5be373c95f977bab4f0f41f736bb1d25075.tar.xz | |
Merge branch 'jc/diff-merge-base-multi'
* jc/diff-merge-base-multi:
diff A...B: do not limit the syntax too narrowly
| -rw-r--r-- | builtin/diff.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index bb128631a9..89ae89cde1 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -409,19 +409,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 |