summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-30 17:31:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-05 02:23:58 (GMT)
commit315f49f20bfbe65cecc2adfe6131588647c57ed4 (patch)
tree4b616779c87d0f0a6ccca7e3086cbc2aa38a4ae8 /builtin
parent66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3 (diff)
downloadgit-315f49f20bfbe65cecc2adfe6131588647c57ed4.zip
git-315f49f20bfbe65cecc2adfe6131588647c57ed4.tar.gz
git-315f49f20bfbe65cecc2adfe6131588647c57ed4.tar.bz2
builtin/diff-tree: cleanup references to sha1
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/diff-tree.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index aef1676..8b26a66 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;