mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
builtin/diff-tree: cleanup references to sha1
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
66f414f885
commit
315f49f20b
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue