From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Mark Levedahl" <mlevedahl@gmail.com>,
"Max Kirillov" <max@max630.net>,
"Jens Lehmann" <Jens.Lehmann@web.de>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 1/3] checkout: pass whole struct to parse_branchname_arg instead of individual flags
Date: Sat, 3 Jan 2015 16:41:25 +0700 [thread overview]
Message-ID: <1420278087-14613-2-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1420278087-14613-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/checkout.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 953b763..d8717ef 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1079,11 +1079,12 @@ static void check_linked_checkouts(struct branch_info *new)
static int parse_branchname_arg(int argc, const char **argv,
int dwim_new_local_branch_ok,
struct branch_info *new,
- struct tree **source_tree,
- unsigned char rev[20],
- const char **new_branch,
- int force_detach)
+ struct checkout_opts *opts,
+ unsigned char rev[20])
{
+ struct tree **source_tree = &opts->source_tree;
+ const char **new_branch = &opts->new_branch;
+ int force_detach = opts->force_detach;
int argcount = 0;
unsigned char branch_rev[20];
const char *arg;
@@ -1420,9 +1421,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
opts.track == BRANCH_TRACK_UNSPECIFIED &&
!opts.new_branch;
int n = parse_branchname_arg(argc, argv, dwim_ok,
- &new, &opts.source_tree,
- rev, &opts.new_branch,
- opts.force_detach);
+ &new, &opts, rev);
argv += n;
argc -= n;
}
--
2.2.0.84.ge9c7a8a
next prev parent reply other threads:[~2015-01-03 9:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-03 9:41 [PATCH 0/3] nd/multiple-work-trees updates Nguyễn Thái Ngọc Duy
2015-01-03 9:41 ` Nguyễn Thái Ngọc Duy [this message]
2015-01-03 9:41 ` [PATCH 2/3] checkout: add --ignore-other-wortrees Nguyễn Thái Ngọc Duy
2015-01-05 3:50 ` Mark Levedahl
2015-01-03 9:41 ` [PATCH 3/3] git-checkout.txt: a note about multiple checkout support for submodules Nguyễn Thái Ngọc Duy
2015-01-05 3:43 ` Mark Levedahl
2015-01-06 21:30 ` Max Kirillov
2015-02-12 22:57 ` [PATCH 0/3] nd/multiple-work-trees updates Junio C Hamano
2015-02-12 23:51 ` Jens Lehmann
2015-02-13 3:17 ` Mark Levedahl
2015-02-13 9:10 ` Dennis Kaarsemaker
2015-02-13 10:14 ` Duy Nguyen
2015-03-18 8:04 ` Ephrim Khong
2015-03-18 8:23 ` Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1420278087-14613-2-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=max@max630.net \
--cc=mlevedahl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.