push: fix segfault for odd config

[git.git] / builtin-clone.c

diff --git a/builtin-clone.c b/builtin-clone.c
index f73029e2ba285bfb20bce1760cef711f7a55fd02..92826cd14c5df6b216b4f50bd80facd061b58ef9 100644 (file)
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@ -350,10 +350,21 @@ static struct ref *write_remote_refs(const struct ref *refs,
        return local_refs;
 }
 
+static void install_branch_config(const char *local,
+                                 const char *origin,
+                                 const char *remote)
+{
+       struct strbuf key = STRBUF_INIT;
+       strbuf_addf(&key, "branch.%s.remote", local);
+       git_config_set(key.buf, origin);
+       strbuf_reset(&key);
+       strbuf_addf(&key, "branch.%s.merge", local);
+       git_config_set(key.buf, remote);
+       strbuf_release(&key);
+}
+
 int cmd_clone(int argc, const char **argv, const char *prefix)
 {
-       int use_local_hardlinks = 1;
-       int use_separate_remote = 1;
        int is_bundle = 0;
        struct stat buf;
        const char *repo_name, *repo, *work_tree, *git_dir;
@@ -375,9 +386,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
        if (argc == 0)
                die("You must specify a repository to clone.");
 
-       if (option_no_hardlinks)
-               use_local_hardlinks = 0;
-
        if (option_mirror)
                option_bare = 1;
 
@@ -386,7 +394,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
                        die("--bare and --origin %s options are incompatible.",
                            option_origin);
                option_no_checkout = 1;
-               use_separate_remote = 0;
        }
 
        if (!option_origin)
@@ -539,6 +546,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
                head_points_at = NULL;
                remote_head = NULL;
                option_no_checkout = 1;
+               if (!option_bare)
+                       install_branch_config("master", option_origin,
+                                             "refs/heads/master");
        }
 
        if (head_points_at) {
@@ -567,11 +577,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
                                      head_points_at->peer_ref->name,
                                      reflog_msg.buf);
 
-                       strbuf_addf(&key, "branch.%s.remote", head);
-                       git_config_set(key.buf, option_origin);
-                       strbuf_reset(&key);
-                       strbuf_addf(&key, "branch.%s.merge", head);
-                       git_config_set(key.buf, head_points_at->name);
+                       install_branch_config(head, option_origin,
+                                             head_points_at->name);
                }
        } else if (remote_head) {
                /* Source had detached HEAD pointing somewhere. */