checkout, commit: remove confusing assignments to rev.abbrev

diff --git a/branch.c b/branch.c
index 40d3c4574350dffdfd65d06a002b537b1cc23302..2ab42aaf4da38b4ea45ef7f0a0f6b807313d4a22 100644 (file)
--- 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);
                }
@@ -188,7 +198,7 @@ void create_branch(const char *head,
                log_all_ref_updates = 1;
 
        if (forcing)
-               snprintf(msg, sizeof msg, "branch: Reset from %s",
+               snprintf(msg, sizeof msg, "branch: Reset to %s",
                         start_name);
        else if (!dont_change_ref)
                snprintf(msg, sizeof msg, "branch: Created from %s",