Merge branch 'rj/status-bisect-while-rebase' into maint-2.43

[thirdparty/git.git] / branch.c

diff --git a/branch.c b/branch.c
index c243f940cdc394eadf46ec8fb3d61ed8176b4839..534594f7f8006d11ebb9b8d10712b6fc6191a043 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -6,6 +6,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "object-name.h"
+#include "path.h"
 #include "refs.h"
 #include "refspec.h"
 #include "remote.h"
@@ -37,7 +38,7 @@ static int find_tracked_branch(struct remote *remote, void *priv)
        if (!remote_find_tracking(remote, &tracking->spec)) {
                switch (++tracking->matches) {
                case 1:
-                       string_list_append(tracking->srcs, tracking->spec.src);
+                       string_list_append_nodup(tracking->srcs, tracking->spec.src);
                        tracking->remote = remote->name;
                        break;
                case 2:
@@ -233,7 +234,7 @@ static int inherit_tracking(struct tracking *tracking, const char *orig_ref)
                return -1;
        }
 
-       tracking->remote = xstrdup(branch->remote_name);
+       tracking->remote = branch->remote_name;
        for (i = 0; i < branch->merge_nr; i++)
                string_list_append(tracking->srcs, branch->merge_name[i]);
        return 0;
@@ -333,7 +334,7 @@ static void setup_tracking(const char *new_ref, const char *orig_ref,
                if (!skip_prefix(tracking.srcs->items[0].string,
                                 "refs/heads/", &tracked_branch) ||
                    strcmp(tracked_branch, new_ref))
-                       return;
+                       goto cleanup;
        }
 
        if (tracking.srcs->nr < 1)
@@ -470,7 +471,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref, int force)
 
        if ((path = branch_checked_out(ref->buf)))
                die(_("cannot force update the branch '%s' "
-                     "checked out at '%s'"),
+                     "used by worktree at '%s'"),
                    ref->buf + strlen("refs/heads/"), path);
 
        return 1;
@@ -480,9 +481,12 @@ static int check_tracking_branch(struct remote *remote, void *cb_data)
 {
        char *tracking_branch = cb_data;
        struct refspec_item query;
+       int res;
        memset(&query, 0, sizeof(struct refspec_item));
        query.dst = tracking_branch;
-       return !remote_find_tracking(remote, &query);
+       res = !remote_find_tracking(remote, &query);
+       free(query.src);
+       return res;
 }
 
 static int validate_remote_tracking_branch(char *ref)
@@ -638,9 +642,10 @@ void dwim_and_setup_tracking(struct repository *r, const char *new_ref,
                             const char *orig_ref, enum branch_track track,
                             int quiet)
 {
-       char *real_orig_ref;
+       char *real_orig_ref = NULL;
        dwim_branch_start(r, orig_ref, track, &real_orig_ref, NULL);
        setup_tracking(new_ref, real_orig_ref, track, quiet);
+       free(real_orig_ref);
 }
 
 /**
@@ -833,7 +838,7 @@ void die_if_checked_out(const char *branch, int ignore_current_worktree)
 
                if (is_shared_symref(worktrees[i], "HEAD", branch)) {
                        skip_prefix(branch, "refs/heads/", &branch);
-                       die(_("'%s' is already checked out at '%s'"),
+                       die(_("'%s' is already used by worktree at '%s'"),
                                branch, worktrees[i]->path);
                }
        }