mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 05:47:53 +01:00
Code Activity

Merge branch 'jc/diff-merge-base-multi'

Browse source 
* jc/diff-merge-base-multi:
  diff A...B: do not limit the syntax too narrowly
This commit is contained in:
Junio C Hamano 2010-07-16 15:45:35 -07:00
commit 24e7a5be37
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
builtin/diff.c
View file

@ -408,19 +408,6 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
else if (ents == 2)
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,