diff options
| author |  Brandon Williams <bmwill@google.com> | 2017-05-30 10:31:04 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-06-05 11:23:58 +0900 |
| commit | 315f49f20bfbe65cecc2adfe6131588647c57ed4 (patch) | |
| tree | 4b616779c87d0f0a6ccca7e3086cbc2aa38a4ae8 | |
| parent | diff-tree: convert diff_tree_sha1 to struct object_id (diff) | |
| download | tgif-315f49f20bfbe65cecc2adfe6131588647c57ed4.tar.xz | |
builtin/diff-tree: cleanup references to sha1
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/diff-tree.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index aef1676198..8b26a66a95 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -7,7 +7,7 @@ static struct rev_info log_tree_opt; -static int diff_tree_commit_sha1(const struct object_id *oid) +static int diff_tree_commit_oid(const struct object_id *oid) { struct commit *commit = lookup_commit_reference(oid); if (!commit) @@ -98,7 +98,6 @@ static void diff_tree_tweak_rev(struct rev_info *rev, struct setup_revision_opt int cmd_diff_tree(int argc, const char **argv, const char *prefix) { - int nr_sha1; char line[1000]; struct object *tree1, *tree2; static struct rev_info *opt = &log_tree_opt; @@ -132,15 +131,14 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) * reverse the order of the objects if the second one * is marked UNINTERESTING. */ - nr_sha1 = opt->pending.nr; - switch (nr_sha1) { + switch (opt->pending.nr) { case 0: if (!read_stdin) usage(diff_tree_usage); break; case 1: tree1 = opt->pending.objects[0].item; - diff_tree_commit_sha1(&tree1->oid); + diff_tree_commit_oid(&tree1->oid); break; case 2: tree1 = opt->pending.objects[0].item; |