diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2013-05-25 11:08:03 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-28 09:25:00 -0700 |
| commit | 91de344d7696ba8d7b92b7c503fdc0d3961e8cd2 (patch) | |
| tree | 60918b487789d1bf7d32f68c0c52e6fa72fec1b2 /builtin | |
| parent | add_rev_cmdline(): make a copy of the name argument (diff) | |
| download | tgif-91de344d7696ba8d7b92b7c503fdc0d3961e8cd2.tar.xz | |
builtin_diff_tree(): make it obvious that function wants two entries
Instead of accepting an array and using exactly two elements from the
array, take two single (struct object_array_entry *) arguments.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diff.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 8c2af6cb43..abdd613a83 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -153,7 +153,8 @@ static int builtin_diff_index(struct rev_info *revs, static int builtin_diff_tree(struct rev_info *revs, int argc, const char **argv, - struct object_array_entry *ent) + struct object_array_entry *ent0, + struct object_array_entry *ent1) { const unsigned char *(sha1[2]); int swap = 0; @@ -161,13 +162,14 @@ static int builtin_diff_tree(struct rev_info *revs, if (argc > 1) usage(builtin_diff_usage); - /* We saw two trees, ent[0] and ent[1]. - * if ent[1] is uninteresting, they are swapped + /* + * We saw two trees, ent0 and ent1. If ent1 is uninteresting, + * swap them. */ - if (ent[1].item->flags & UNINTERESTING) + if (ent1->item->flags & UNINTERESTING) swap = 1; - sha1[swap] = ent[0].item->sha1; - sha1[1-swap] = ent[1].item->sha1; + sha1[swap] = ent0->item->sha1; + sha1[1-swap] = ent1->item->sha1; diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt); log_tree_diff_flush(revs); return 0; @@ -403,7 +405,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) else if (ents == 1) result = builtin_diff_index(&rev, argc, argv); else if (ents == 2) - result = builtin_diff_tree(&rev, argc, argv, ent); + result = builtin_diff_tree(&rev, argc, argv, &ent[0], &ent[1]); else if (ent[0].item->flags & UNINTERESTING) { /* * diff A...B where there is at least one merge base @@ -412,8 +414,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) * 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); + result = builtin_diff_tree(&rev, argc, argv, &ent[0], &ent[ents-1]); } else result = builtin_diff_combined(&rev, argc, argv, ent, ents); |