summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-16 22:45:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-16 22:45:35 (GMT)
commit24e7a5be373c95f977bab4f0f41f736bb1d25075 (patch)
tree815dbc4e0bb0d528ed9a7e53394b0ffe5b198e84 /builtin/diff.c
parent7ea3ddf818dbd59ae8002e98f56e60742746db45 (diff)
parent7a0e4d7c39083e951625e4c3434d05abfea8f5e6 (diff)
downloadgit-24e7a5be373c95f977bab4f0f41f736bb1d25075.zip
git-24e7a5be373c95f977bab4f0f41f736bb1d25075.tar.gz
git-24e7a5be373c95f977bab4f0f41f736bb1d25075.tar.bz2
Merge branch 'jc/diff-merge-base-multi'
* jc/diff-merge-base-multi: diff A...B: do not limit the syntax too narrowly
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index bb12863..89ae89c 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