pull --rebase=<type>: allow single-letter abbreviations for the type

diff --git a/checkout.c b/checkout.c
index 193ba856750396abfc347fe5c191aa9da7b5f952..bdefc888bae1516f0ddcf22264807d031af7c991 100644 (file)
--- a/checkout.c
+++ b/checkout.c
@@ -13,8 +13,8 @@ struct tracking_name_data {
 static int check_tracking_name(struct remote *remote, void *cb_data)
 {
        struct tracking_name_data *cb = cb_data;
-       struct refspec query;
-       memset(&query, 0, sizeof(struct refspec));
+       struct refspec_item query;
+       memset(&query, 0, sizeof(struct refspec_item));
        query.src = cb->src_ref;
        if (remote_find_tracking(remote, &query) ||
            get_oid(query.dst, cb->dst_oid)) {