oneway_merge(): only lstat() when told to update worktree

diff --git a/branch.c b/branch.c
index d7fd267b7ed189eaca02caf6628969b50169ec45..2bef1e7e71b7cb3375b3d96fab5c4f20e0c3adff 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -74,25 +74,33 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
                strbuf_addf(&key, "branch.%s.rebase", local);
                git_config_set(key.buf, "true");
        }
+       strbuf_release(&key);
 
        if (flag & BRANCH_CONFIG_VERBOSE) {
-               strbuf_reset(&key);
-
-               strbuf_addstr(&key, origin ? "remote" : "local");
-
-               /* Are we tracking a proper "branch"? */
-               if (remote_is_branch) {
-                       strbuf_addf(&key, " branch %s", shortname);
-                       if (origin)
-                               strbuf_addf(&key, " from %s", origin);
-               }
+               if (remote_is_branch && origin)
+                       printf(rebasing ?
+                              "Branch %s set up to track remote branch %s from %s by rebasing.\n" :
+                              "Branch %s set up to track remote branch %s from %s.\n",
+                              local, shortname, origin);
+               else if (remote_is_branch && !origin)
+                       printf(rebasing ?
+                              "Branch %s set up to track local branch %s by rebasing.\n" :
+                              "Branch %s set up to track local branch %s.\n",
+                              local, shortname);
+               else if (!remote_is_branch && origin)
+                       printf(rebasing ?
+                              "Branch %s set up to track remote ref %s by rebasing.\n" :
+                              "Branch %s set up to track remote ref %s.\n",
+                              local, remote);
+               else if (!remote_is_branch && !origin)
+                       printf(rebasing ?
+                              "Branch %s set up to track local ref %s by rebasing.\n" :
+                              "Branch %s set up to track local ref %s.\n",
+                              local, remote);
                else
-                       strbuf_addf(&key, " ref %s", remote);
-               printf("Branch %s set up to track %s%s.\n",
-                      local, key.buf,
-                      rebasing ? " by rebasing" : "");
+                       die("BUG: impossible combination of %d and %p",
+                           remote_is_branch, origin);
        }
-       strbuf_release(&key);
 }
 
 /*
@@ -101,9 +109,10 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
  * config.
  */
 static int setup_tracking(const char *new_ref, const char *orig_ref,
-                          enum branch_track track)
+                         enum branch_track track, int quiet)
 {
        struct tracking tracking;
+       int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
 
        if (strlen(new_ref) > 1024 - 7 - 7 - 1)
                return error("Tracking not set up: name too long: %s",
@@ -128,13 +137,44 @@ static int setup_tracking(const char *new_ref, const char *orig_ref,
                return error("Not tracking: ambiguous information for ref %s",
                                orig_ref);
 
-       install_branch_config(BRANCH_CONFIG_VERBOSE, new_ref, tracking.remote,
+       install_branch_config(config_flags, new_ref, tracking.remote,
                              tracking.src ? tracking.src : orig_ref);
 
        free(tracking.src);
        return 0;
 }
 
+struct branch_desc_cb {
+       const char *config_name;
+       const char *value;
+};
+
+static int read_branch_desc_cb(const char *var, const char *value, void *cb)
+{
+       struct branch_desc_cb *desc = cb;
+       if (strcmp(desc->config_name, var))
+               return 0;
+       free((char *)desc->value);
+       return git_config_string(&desc->value, var, value);
+}
+
+int read_branch_desc(struct strbuf *buf, const char *branch_name)
+{
+       struct branch_desc_cb cb;
+       struct strbuf name = STRBUF_INIT;
+       strbuf_addf(&name, "branch.%s.description", branch_name);
+       cb.config_name = name.buf;
+       cb.value = NULL;
+       if (git_config(read_branch_desc_cb, &cb) < 0) {
+               strbuf_release(&name);
+               return -1;
+       }
+       if (cb.value)
+               strbuf_addstr(buf, cb.value);
+       strbuf_release(&name);
+       return 0;
+}
+
 int validate_new_branchname(const char *name, struct strbuf *ref,
                            int force, int attr_only)
 {
@@ -150,7 +190,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
                const char *head;
                unsigned char sha1[20];
 
-               head = resolve_ref("HEAD", sha1, 0, NULL);
+               head = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
                if (!is_bare_repository() && head && !strcmp(head, ref->buf))
                        die("Cannot force update the current branch.");
        }
@@ -160,7 +200,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
 void create_branch(const char *head,
                   const char *name, const char *start_name,
                   int force, int reflog, int clobber_head,
-                  enum branch_track track)
+                  int quiet, enum branch_track track)
 {
        struct ref_lock *lock = NULL;
        struct commit *commit;
@@ -229,7 +269,7 @@ void create_branch(const char *head,
                         start_name);
 
        if (real_ref && track)
-               setup_tracking(ref.buf+11, real_ref, track);
+               setup_tracking(ref.buf+11, real_ref, track, quiet);
 
        if (!dont_change_ref)
                if (write_ref_sha1(lock, sha1, msg) < 0)