Merge branch 'pt/am-abort-fix'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 2f92328db46b4ff81e32b32339ad830c4b76688b..9b49f0e413ba03ebfee924d514a175d8f74fe1d3 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -702,10 +702,10 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 }
 
 static int add_pending_uninteresting_ref(const char *refname,
-                                        const unsigned char *sha1,
+                                        const struct object_id *oid,
                                         int flags, void *cb_data)
 {
-       add_pending_sha1(cb_data, refname, sha1, UNINTERESTING);
+       add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING);
        return 0;
 }