From: Junio C Hamano Date: Fri, 20 Mar 2009 21:29:49 +0000 (-0700) Subject: Merge branch 'jc/clone-branch-rebase' X-Git-Tag: v1.6.3-rc0~124 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0f64f874317a67d4d32bc10d85cf19e27ff0e43b;p=git.git Merge branch 'jc/clone-branch-rebase' * jc/clone-branch-rebase: Improve "git branch --tracking" output Make git-clone respect branch.autosetuprebase Conflicts: builtin-clone.c --- 0f64f874317a67d4d32bc10d85cf19e27ff0e43b diff --cc builtin-clone.c index efbc804a3,a5f000adf..7fbfbf973 --- a/builtin-clone.c +++ b/builtin-clone.c @@@ -20,8 -20,7 +20,9 @@@ #include "dir.h" #include "pack-refs.h" #include "sigchain.h" + #include "branch.h" +#include "remote.h" +#include "run-command.h" /* * Overall FIXMEs: @@@ -315,21 -351,10 +316,8 @@@ static struct ref *write_remote_refs(co 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;