summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-15 19:08:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-15 19:08:25 (GMT)
commit4cd1b99c32d9a345438d098f37e75077d072778f (patch)
treedead0a8c55e9d812224c8966290249cb85aecd53 /builtin/diff.c
parenta8b7fcffddc6bce0875775154d6a41a528340d71 (diff)
parentc008c0ff2087da7b98adfa760247776619b32224 (diff)
downloadgit-4cd1b99c32d9a345438d098f37e75077d072778f.zip
git-4cd1b99c32d9a345438d098f37e75077d072778f.tar.gz
git-4cd1b99c32d9a345438d098f37e75077d072778f.tar.bz2
Merge branch 'jc/diff-merge-base-multi'
* jc/diff-merge-base-multi: diff A...B: give one possible diff when there are more than one merge-base
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c31
1 files changed, 23 insertions, 8 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index ffcdd05..bb12863 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -407,17 +407,32 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
result = builtin_diff_index(&rev, argc, argv);
else if (ents == 2)
result = builtin_diff_tree(&rev, argc, argv, ent);
- else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {
- /* diff A...B where there is one sane merge base between
- * A and B. We have ent[0] == merge-base, ent[1] == A,
- * and ent[2] == B. Show diff between the base and B.
+ 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...
*/
- ent[1] = ent[2];
+ 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
+ * between the base and B. Note that we pick one
+ * merge base at random if there are more than one.
+ */
+ ent[1] = ent[ents-1];
result = builtin_diff_tree(&rev, argc, argv, ent);
- }
- else
+ } else
result = builtin_diff_combined(&rev, argc, argv,
- ent, ents);
+ ent, ents);
result = diff_result_code(&rev.diffopt, result);
if (1 < rev.diffopt.skip_stat_unmatch)
refresh_index_quietly();