diff-tree: convert diff_tree_sha1 to struct object_id
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
9e5e0c289a
commit
66f414f885
@ -2129,8 +2129,8 @@ cleanup_head_ref:
|
||||
if (read_oneliner(&buf, rebase_path_orig_head(), 0) &&
|
||||
!get_sha1(buf.buf, orig.hash) &&
|
||||
!get_sha1("HEAD", head.hash)) {
|
||||
diff_tree_sha1(orig.hash, head.hash,
|
||||
"", &log_tree_opt.diffopt);
|
||||
diff_tree_oid(&orig, &head, "",
|
||||
&log_tree_opt.diffopt);
|
||||
log_tree_diff_flush(&log_tree_opt);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user