Merge branch 'maint'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 72e4fbc729f0afcc459ab67926e9c2575fd72094..1994be92c66257da18c31502bda605be170fd092 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -636,7 +636,8 @@ static int check_tracking_name(const char *refname, const unsigned char *sha1,
 
 static const char *unique_tracking_name(const char *name)
 {
-       struct tracking_name_data cb_data = { name, NULL, 1 };
+       struct tracking_name_data cb_data = { NULL, NULL, 1 };
+       cb_data.name = name;
        for_each_ref(check_tracking_name, &cb_data);
        if (cb_data.unique)
                return cb_data.remote;