rebase: use the new git-rebase--preserve-merges.sh

diff --git a/line-log.c b/line-log.c
index cdc2257db56f7d68412bb456e91854a9e9aa5cd5..ecdce08c4be24cc14109796d9a7c165c53753a88 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -501,8 +501,7 @@ static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
        unsigned mode;
        struct object_id oid;
 
-       if (get_tree_entry(commit->object.oid.hash, spec->path,
-                          oid.hash, &mode))
+       if (get_tree_entry(&commit->object.oid, spec->path, &oid, &mode))
                die("There is no path %s in the commit", spec->path);
        fill_filespec(spec, &oid, 1, mode);