Merge branch 'sb/branch-avoid-repeated-strbuf-release'
authorJunio C Hamano <gitster@pobox.com>
Sat, 7 Oct 2017 07:27:54 +0000 (16:27 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 7 Oct 2017 07:27:54 +0000 (16:27 +0900)
* sb/branch-avoid-repeated-strbuf-release:
  branch: reset instead of release a strbuf

1  2 
builtin/branch.c

diff --combined builtin/branch.c
@@@ -28,7 -28,6 +28,7 @@@ static const char * const builtin_branc
        N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
        N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
        N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
 +      N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"),
        N_("git branch [<options>] [-r | -a] [--points-at]"),
        N_("git branch [<options>] [-r | -a] [--format]"),
        NULL
@@@ -217,7 -216,7 +217,7 @@@ static int delete_branches(int argc, co
                if (!head_rev)
                        die(_("Couldn't look up commit object for HEAD"));
        }
-       for (i = 0; i < argc; i++, strbuf_release(&bname)) {
+       for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
                char *target = NULL;
                int flags = 0;
  
        }
  
        free(name);
+       strbuf_release(&bname);
  
-       return(ret);
+       return ret;
  }
  
  static int calc_maxwidth(struct ref_array *refs, int remote_bonus)
@@@ -353,7 -353,7 +354,7 @@@ static char *build_format(struct ref_fi
                        strbuf_addf(&obname, "%%(objectname:short=%d)", filter->abbrev);
  
                strbuf_addf(&local, "%%(align:%d,left)%%(refname:lstrip=2)%%(end)", maxwidth);
 -              strbuf_addf(&local, "%s", branch_get_color(BRANCH_COLOR_RESET));
 +              strbuf_addstr(&local, branch_get_color(BRANCH_COLOR_RESET));
                strbuf_addf(&local, " %s ", obname.buf);
  
                if (filter->verbose > 1)
@@@ -457,19 -457,15 +458,19 @@@ static void reject_rebase_or_bisect_bra
        free_worktrees(worktrees);
  }
  
 -static void rename_branch(const char *oldname, const char *newname, int force)
 +static void copy_or_rename_branch(const char *oldname, const char *newname, int copy, int force)
  {
        struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
        struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
        int recovery = 0;
        int clobber_head_ok;
  
 -      if (!oldname)
 -              die(_("cannot rename the current branch while not on any."));
 +      if (!oldname) {
 +              if (copy)
 +                      die(_("cannot copy the current branch while not on any."));
 +              else
 +                      die(_("cannot rename the current branch while not on any."));
 +      }
  
        if (strbuf_check_branch_ref(&oldref, oldname)) {
                /*
  
        reject_rebase_or_bisect_branch(oldref.buf);
  
 -      strbuf_addf(&logmsg, "Branch: renamed %s to %s",
 -               oldref.buf, newref.buf);
 +      if (copy)
 +              strbuf_addf(&logmsg, "Branch: copied %s to %s",
 +                          oldref.buf, newref.buf);
 +      else
 +              strbuf_addf(&logmsg, "Branch: renamed %s to %s",
 +                          oldref.buf, newref.buf);
  
 -      if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
 +      if (!copy && rename_ref(oldref.buf, newref.buf, logmsg.buf))
                die(_("Branch rename failed"));
 +      if (copy && copy_existing_ref(oldref.buf, newref.buf, logmsg.buf))
 +              die(_("Branch copy failed"));
  
 -      if (recovery)
 -              warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
 +      if (recovery) {
 +              if (copy)
 +                      warning(_("Copied a misnamed branch '%s' away"),
 +                              oldref.buf + 11);
 +              else
 +                      warning(_("Renamed a misnamed branch '%s' away"),
 +                              oldref.buf + 11);
 +      }
  
 -      if (replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf))
 +      if (!copy &&
 +          replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf))
                die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
  
        strbuf_release(&logmsg);
        strbuf_release(&oldref);
        strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
        strbuf_release(&newref);
 -      if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
 +      if (!copy && git_config_rename_section(oldsection.buf, newsection.buf) < 0)
                die(_("Branch is renamed, but update of config-file failed"));
 +      if (copy && strcmp(oldname, newname) && git_config_copy_section(oldsection.buf, newsection.buf) < 0)
 +              die(_("Branch is copied, but update of config-file failed"));
        strbuf_release(&oldsection);
        strbuf_release(&newsection);
  }
@@@ -564,7 -545,7 +565,7 @@@ static int edit_branch_description(cons
  
  int cmd_branch(int argc, const char **argv, const char *prefix)
  {
 -      int delete = 0, rename = 0, force = 0, list = 0;
 +      int delete = 0, rename = 0, copy = 0, force = 0, list = 0;
        int reflog = 0, edit_description = 0;
        int quiet = 0, unset_upstream = 0;
        const char *new_upstream = NULL;
                OPT__QUIET(&quiet, N_("suppress informational messages")),
                OPT_SET_INT('t', "track",  &track, N_("set up tracking mode (see git-pull(1))"),
                        BRANCH_TRACK_EXPLICIT),
 -              OPT_SET_INT( 0, "set-upstream",  &track, N_("change upstream info"),
 -                      BRANCH_TRACK_OVERRIDE),
 +              { OPTION_SET_INT, 0, "set-upstream", &track, NULL, N_("do not use"),
 +                      PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, BRANCH_TRACK_OVERRIDE },
                OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),
                OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("Unset the upstream info")),
                OPT__COLOR(&branch_use_color, N_("use colored output")),
                OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
                OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
                OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
 +              OPT_BIT('c', "copy", &copy, N_("copy a branch and its reflog"), 1),
 +              OPT_BIT('C', NULL, &copy, N_("copy a branch, even if target exists"), 2),
                OPT_BOOL(0, "list", &list, N_("list branch names")),
                OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")),
                OPT_BOOL(0, "edit-description", &edit_description,
        argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
                             0);
  
 -      if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0)
 +      if (!delete && !rename && !copy && !edit_description && !new_upstream && !unset_upstream && argc == 0)
                list = 1;
  
        if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr ||
            filter.no_commit)
                list = 1;
  
 -      if (!!delete + !!rename + !!new_upstream +
 +      if (!!delete + !!rename + !!copy + !!new_upstream +
            list + unset_upstream > 1)
                usage_with_options(builtin_branch_usage, options);
  
        if (force) {
                delete *= 2;
                rename *= 2;
 +              copy *= 2;
        }
  
        if (delete) {
  
                if (edit_branch_description(branch_name))
                        return 1;
 +      } else if (copy) {
 +              if (!argc)
 +                      die(_("branch name required"));
 +              else if (argc == 1)
 +                      copy_or_rename_branch(head, argv[0], 1, copy > 1);
 +              else if (argc == 2)
 +                      copy_or_rename_branch(argv[0], argv[1], 1, copy > 1);
 +              else
 +                      die(_("too many branches for a copy operation"));
        } else if (rename) {
                if (!argc)
                        die(_("branch name required"));
                else if (argc == 1)
 -                      rename_branch(head, argv[0], rename > 1);
 +                      copy_or_rename_branch(head, argv[0], 0, rename > 1);
                else if (argc == 2)
 -                      rename_branch(argv[0], argv[1], rename > 1);
 +                      copy_or_rename_branch(argv[0], argv[1], 0, rename > 1);
                else
                        die(_("too many branches for a rename operation"));
        } else if (new_upstream) {
                strbuf_release(&buf);
        } else if (argc > 0 && argc <= 2) {
                struct branch *branch = branch_get(argv[0]);
 -              int branch_existed = 0, remote_tracking = 0;
 -              struct strbuf buf = STRBUF_INIT;
  
                if (!strcmp(argv[0], "HEAD"))
                        die(_("it does not make sense to create 'HEAD' manually"));
                        die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
  
                if (track == BRANCH_TRACK_OVERRIDE)
 -                      fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n"));
 -
 -              strbuf_addf(&buf, "refs/remotes/%s", branch->name);
 -              remote_tracking = ref_exists(buf.buf);
 -              strbuf_release(&buf);
 +                      die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));
  
 -              branch_existed = ref_exists(branch->refname);
                create_branch(argv[0], (argc == 2) ? argv[1] : head,
                              force, reflog, 0, quiet, track);
  
 -              /*
 -               * We only show the instructions if the user gave us
 -               * one branch which doesn't exist locally, but is the
 -               * name of a remote-tracking branch.
 -               */
 -              if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
 -                  !branch_existed && remote_tracking) {
 -                      fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
 -                      fprintf(stderr, "    git branch -d %s\n", branch->name);
 -                      fprintf(stderr, "    git branch --set-upstream-to %s\n", branch->name);
 -              }
 -
        } else
                usage_with_options(builtin_branch_usage, options);