summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-08-09 16:00:12 +0200
committerJunio C Hamano <gitster@pobox.com>2008-08-11 16:37:28 -0700
commitbb0ceb6264fa1aea6e68e07cb13cd9a88473febb (patch)
tree3bb234811f3e3ff627dd73d83e99cf0adfa6eb17 /builtin-checkout.c
parentac39efbdf3d41443c40166b7578b7fb87c2f3b60 (diff)
downloadgit-bb0ceb6264fa1aea6e68e07cb13cd9a88473febb.tar.gz
checkout --track: make up a sensible branch name if '-b' was omitted
What does the user most likely want with this command? $ git checkout --track origin/next Exactly. A branch called 'next', that tracks origin's branch 'next'. Make it so. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-checkout.c')
-rw-r--r--builtin-checkout.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 411cc513c6..e95eab9b1b 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -437,13 +437,28 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
git_config(git_default_config, NULL);
- opts.track = git_branch_track;
+ opts.track = -1;
argc = parse_options(argc, argv, options, checkout_usage,
PARSE_OPT_KEEP_DASHDASH);
- if (!opts.new_branch && (opts.track != git_branch_track))
- die("git checkout: --track and --no-track require -b");
+ /* --track without -b should DWIM */
+ if (opts.track && opts.track != -1 && !opts.new_branch) {
+ char *slash;
+ if (!argc || !strcmp(argv[0], "--"))
+ die ("--track needs a branch name");
+ slash = strchr(argv[0], '/');
+ if (slash && !prefixcmp(argv[0], "refs/"))
+ slash = strchr(slash + 1, '/');
+ if (slash && !prefixcmp(argv[0], "remotes/"))
+ slash = strchr(slash + 1, '/');
+ if (!slash || !slash[1])
+ die ("Missing branch name; try -b");
+ opts.new_branch = slash + 1;
+ }
+
+ if (opts.track == -1)
+ opts.track = git_branch_track;
if (opts.force && opts.merge)
die("git checkout: -f and -m are incompatible");