diff options
| author | Brandon Williams <bmwill@google.com> | 2017-05-30 10:31:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 11:23:58 +0900 |
| commit | 66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3 (patch) | |
| tree | 93238d8cef2a91c8792e591e2752bb1971543581 /sequencer.c | |
| parent | 9e5e0c289a900186b8943741cc632ea3bb6e1510 (diff) | |
| download | git-66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3.tar.gz | |
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>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index a23b948ac1..7a114def84 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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); } } |