From: Matthieu Moy Date: Mon, 18 Jan 2010 20:44:12 +0000 (+0200) Subject: branch: warn and refuse to set a branch as a tracking branch of itself. X-Git-Tag: v1.7.0-rc0~23^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85e2233f982f760d0e731b1258da2580834d8027;p=git.git branch: warn and refuse to set a branch as a tracking branch of itself. Previous patch allows commands like "git branch --set-upstream foo foo", which doesn't make much sense. Warn the user and don't change the configuration in this case. Don't die to let the caller finish its job in such case. Signed-off-by: Matthieu Moy Signed-off-by: Ilari Liusvaara Signed-off-by: Junio C Hamano --- diff --git a/branch.c b/branch.c index 40d3c4574..9e1f63ed8 100644 --- a/branch.c +++ b/branch.c @@ -49,9 +49,19 @@ static int should_setup_rebase(const char *origin) void install_branch_config(int flag, const char *local, const char *origin, const char *remote) { + const char *shortname = remote + 11; + int remote_is_branch = !prefixcmp(remote, "refs/heads/"); struct strbuf key = STRBUF_INIT; int rebasing = should_setup_rebase(origin); + if (remote_is_branch + && !strcmp(local, shortname) + && !origin) { + warning("Not setting branch %s as its own upstream.", + local); + return; + } + strbuf_addf(&key, "branch.%s.remote", local); git_config_set(key.buf, origin ? origin : "."); @@ -71,8 +81,8 @@ void install_branch_config(int flag, const char *local, const char *origin, cons strbuf_addstr(&key, origin ? "remote" : "local"); /* Are we tracking a proper "branch"? */ - if (!prefixcmp(remote, "refs/heads/")) { - strbuf_addf(&key, " branch %s", remote + 11); + if (remote_is_branch) { + strbuf_addf(&key, " branch %s", shortname); if (origin) strbuf_addf(&key, " from %s", origin); }