Merge branch 'sg/travis-fixes'

diff --git a/fast-import.c b/fast-import.c
index 32951b0d4a8c6361fd6a2c9d70365538c35c1e99..b70ac025e0428b239c9cb8b8a70dda70c0cc1007 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1758,7 +1758,7 @@ static int update_branch(struct branch *b)
                        delete_ref(NULL, b->name, NULL, 0);
                return 0;
        }
-       if (read_ref(b->name, old_oid.hash))
+       if (read_ref(b->name, &old_oid))
                oidclr(&old_oid);
        if (!force_update && !is_null_oid(&old_oid)) {
                struct commit *old_cmit, *new_cmit;