mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout --track: make up a sensible branch name if '-b' was omitted

Browse Source 
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>
This commit is contained in:
Johannes Schindelin
2008-08-09 16:00:12 +02:00
committed by Junio C Hamano
parent ac39efbdf3
commit bb0ceb6264
3 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
builtin-checkout.c
View File

@ -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");