From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Sunshine Subject: [PATCH v3 12/22] worktree: introduce options container Date: Fri, 17 Jul 2015 19:00:07 -0400 Message-ID: <1437174017-81687-13-git-send-email-sunshine@sunshineco.com> References: <1437174017-81687-1-git-send-email-sunshine@sunshineco.com> Cc: Junio C Hamano , Duy Nguyen , Michael J Gruber , Eric Sunshine To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jul 18 01:02:13 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZGEdu-0002hL-GI for gcvg-git-2@plane.gmane.org; Sat, 18 Jul 2015 01:02:10 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752327AbbGQXCD (ORCPT ); Fri, 17 Jul 2015 19:02:03 -0400 Received: from mail-ig0-f180.google.com ([209.85.213.180]:34642 "EHLO mail-ig0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753898AbbGQXBY (ORCPT ); Fri, 17 Jul 2015 19:01:24 -0400 Received: by igvi1 with SMTP id i1so45053897igv.1 for ; Fri, 17 Jul 2015 16:01:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=hV523HhrErKqYm0AfzyMSzpQ7gRfJE1ePU7C6XiPfe0=; b=p8R14UlBTLnlAAy3irlB1XRkzD5qmM3Co3DeTSnG7+YVIiQql7b33JVJGwPm4fRkHO yZ7OV0UwklgjafTfwmz+GohnM5wg6tfqRHbnbaHnyQXjcD8OR8+VKL77sdDbL2Z8xqCx XpQbOGR/Js17s3uAAA0uBpdWgRWEvoHi/Ix1o+JLHxwGMaMGFWYJ1PCmQ9R0DiyznTYe qpWBvNkjt2fVOPkRhZkAPUZDwbocoAoSsREgQoad/6TbG1ZmAu7TsqPtV/mCTlHx+IrW 2RwFkUJY36bslPb9CJxMHx7O99chm8dF+hQUDAy/gmX4kzhmHLkssPBpRwHMAFBW91oo ACZw== X-Received: by 10.107.137.96 with SMTP id l93mr21652843iod.60.1437174083631; Fri, 17 Jul 2015 16:01:23 -0700 (PDT) Received: from localhost.localdomain (user-12l3cpl.cable.mindspring.com. [69.81.179.53]) by smtp.gmail.com with ESMTPSA id 140sm8414824ion.16.2015.07.17.16.01.22 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Jul 2015 16:01:23 -0700 (PDT) X-Mailer: git-send-email 2.5.0.rc2.378.g0af52e8 In-Reply-To: <1437174017-81687-1-git-send-email-sunshine@sunshineco.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: add_worktree() will eventually need to deal with some options itself, so introduce a structure into which options can be conveniently bundled, and pass it along to add_worktree(). Signed-off-by: Eric Sunshine --- No changes since v2. builtin/worktree.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index bf4db9f..7d70eb6 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -12,6 +12,13 @@ static const char * const worktree_usage[] = { NULL }; +struct add_opts { + int force; + int detach; + const char *new_branch; + int force_new_branch; +}; + static int show_only; static int verbose; static unsigned long expire; @@ -171,7 +178,8 @@ static const char *worktree_basename(const char *path, int *olen) return name; } -static int add_worktree(const char *path, const char **child_argv) +static int add_worktree(const char *path, const char **child_argv, + const struct add_opts *opts) { struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT; struct strbuf sb = STRBUF_INIT; @@ -272,22 +280,23 @@ static int add_worktree(const char *path, const char **child_argv) static int add(int ac, const char **av, const char *prefix) { - int force = 0, detach = 0, force_new_branch; - const char *new_branch = NULL, *new_branch_force = NULL; + struct add_opts opts; + const char *new_branch_force = NULL; const char *path, *branch; struct argv_array cmd = ARGV_ARRAY_INIT; struct option options[] = { - OPT__FORCE(&force, N_("checkout even if already checked out in other worktree")), - OPT_STRING('b', NULL, &new_branch, N_("branch"), + OPT__FORCE(&opts.force, N_("checkout even if already checked out in other worktree")), + OPT_STRING('b', NULL, &opts.new_branch, N_("branch"), N_("create a new branch")), OPT_STRING('B', NULL, &new_branch_force, N_("branch"), N_("create or reset a branch")), - OPT_BOOL(0, "detach", &detach, N_("detach HEAD at named commit")), + OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")), OPT_END() }; + memset(&opts, 0, sizeof(opts)); ac = parse_options(ac, av, prefix, options, worktree_usage, 0); - if (new_branch && new_branch_force) + if (opts.new_branch && new_branch_force) die(_("-b and -B are mutually exclusive")); if (ac < 1 || ac > 2) usage_with_options(worktree_usage, options); @@ -295,27 +304,27 @@ static int add(int ac, const char **av, const char *prefix) path = prefix ? prefix_filename(prefix, strlen(prefix), av[0]) : av[0]; branch = ac < 2 ? "HEAD" : av[1]; - force_new_branch = !!new_branch_force; - if (force_new_branch) - new_branch = new_branch_force; + opts.force_new_branch = !!new_branch_force; + if (opts.force_new_branch) + opts.new_branch = new_branch_force; - if (ac < 2 && !new_branch) { + if (ac < 2 && !opts.new_branch) { int n; const char *s = worktree_basename(path, &n); - new_branch = xstrndup(s, n); + opts.new_branch = xstrndup(s, n); } argv_array_push(&cmd, "checkout"); - if (force) + if (opts.force) argv_array_push(&cmd, "--ignore-other-worktrees"); - if (new_branch) - argv_array_pushl(&cmd, force_new_branch ? "-B" : "-b", - new_branch, NULL); - if (detach) + if (opts.new_branch) + argv_array_pushl(&cmd, opts.force_new_branch ? "-B" : "-b", + opts.new_branch, NULL); + if (opts.detach) argv_array_push(&cmd, "--detach"); argv_array_push(&cmd, branch); - return add_worktree(path, cmd.argv); + return add_worktree(path, cmd.argv, &opts); } int cmd_worktree(int ac, const char **av, const char *prefix) -- 2.5.0.rc2.378.g0af52e8