mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'jc/checkout-auto-track'
* jc/checkout-auto-track: git checkout --no-guess DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz" check_filename(): make verify_filename() callable without dying
This commit is contained in:
commit
e3de372e13
|
@ -572,6 +572,40 @@ static int interactive_checkout(const char *revision, const char **pathspec,
|
|||
return run_add_interactive(revision, "--patch=checkout", pathspec);
|
||||
}
|
||||
|
||||
struct tracking_name_data {
|
||||
const char *name;
|
||||
char *remote;
|
||||
int unique;
|
||||
};
|
||||
|
||||
static int check_tracking_name(const char *refname, const unsigned char *sha1,
|
||||
int flags, void *cb_data)
|
||||
{
|
||||
struct tracking_name_data *cb = cb_data;
|
||||
const char *slash;
|
||||
|
||||
if (prefixcmp(refname, "refs/remotes/"))
|
||||
return 0;
|
||||
slash = strchr(refname + 13, '/');
|
||||
if (!slash || strcmp(slash + 1, cb->name))
|
||||
return 0;
|
||||
if (cb->remote) {
|
||||
cb->unique = 0;
|
||||
return 0;
|
||||
}
|
||||
cb->remote = xstrdup(refname);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const char *unique_tracking_name(const char *name)
|
||||
{
|
||||
struct tracking_name_data cb_data = { name, NULL, 1 };
|
||||
for_each_ref(check_tracking_name, &cb_data);
|
||||
if (cb_data.unique)
|
||||
return cb_data.remote;
|
||||
free(cb_data.remote);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int cmd_checkout(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
|
@ -582,6 +616,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
|||
struct tree *source_tree = NULL;
|
||||
char *conflict_style = NULL;
|
||||
int patch_mode = 0;
|
||||
int dwim_new_local_branch = 1;
|
||||
struct option options[] = {
|
||||
OPT__QUIET(&opts.quiet),
|
||||
OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),
|
||||
|
@ -597,6 +632,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
|||
OPT_STRING(0, "conflict", &conflict_style, "style",
|
||||
"conflict style (merge or diff3)"),
|
||||
OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"),
|
||||
{ OPTION_BOOLEAN, 0, "guess", &dwim_new_local_branch, NULL,
|
||||
"second guess 'git checkout no-such-branch'",
|
||||
PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
|
||||
OPT_END(),
|
||||
};
|
||||
int has_dash_dash;
|
||||
|
@ -630,8 +668,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
|||
opts.new_branch = argv0 + 1;
|
||||
}
|
||||
|
||||
if (opts.track == BRANCH_TRACK_UNSPECIFIED)
|
||||
opts.track = git_branch_track;
|
||||
if (conflict_style) {
|
||||
opts.merge = 1; /* implied */
|
||||
git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
|
||||
|
@ -655,6 +691,11 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
|||
* With no paths, if <something> is a commit, that is to
|
||||
* switch to the branch or detach HEAD at it.
|
||||
*
|
||||
* With no paths, if <something> is _not_ a commit, no -t nor -b
|
||||
* was given, and there is a tracking branch whose name is
|
||||
* <something> in one and only one remote, then this is a short-hand
|
||||
* to fork local <something> from that remote tracking branch.
|
||||
*
|
||||
* Otherwise <something> shall not be ambiguous.
|
||||
* - If it's *only* a reference, treat it like case (1).
|
||||
* - If it's only a path, treat it like case (2).
|
||||
|
@ -677,7 +718,21 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
|||
if (get_sha1(arg, rev)) {
|
||||
if (has_dash_dash) /* case (1) */
|
||||
die("invalid reference: %s", arg);
|
||||
goto no_reference; /* case (3 -> 2) */
|
||||
if (!patch_mode &&
|
||||
dwim_new_local_branch &&
|
||||
opts.track == BRANCH_TRACK_UNSPECIFIED &&
|
||||
!opts.new_branch &&
|
||||
!check_filename(NULL, arg) &&
|
||||
argc == 1) {
|
||||
const char *remote = unique_tracking_name(arg);
|
||||
if (!remote || get_sha1(remote, rev))
|
||||
goto no_reference;
|
||||
opts.new_branch = arg;
|
||||
arg = remote;
|
||||
/* DWIMmed to create local branch */
|
||||
}
|
||||
else
|
||||
goto no_reference;
|
||||
}
|
||||
|
||||
/* we can't end up being in (2) anymore, eat the argument */
|
||||
|
@ -715,6 +770,10 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
|||
}
|
||||
|
||||
no_reference:
|
||||
|
||||
if (opts.track == BRANCH_TRACK_UNSPECIFIED)
|
||||
opts.track = git_branch_track;
|
||||
|
||||
if (argc) {
|
||||
const char **pathspec = get_pathspec(prefix, argv);
|
||||
|
||||
|
|
1
cache.h
1
cache.h
|
@ -396,6 +396,7 @@ extern const char *setup_git_directory_gently(int *);
|
|||
extern const char *setup_git_directory(void);
|
||||
extern const char *prefix_path(const char *prefix, int len, const char *path);
|
||||
extern const char *prefix_filename(const char *prefix, int len, const char *path);
|
||||
extern int check_filename(const char *prefix, const char *name);
|
||||
extern void verify_filename(const char *prefix, const char *name);
|
||||
extern void verify_non_filename(const char *prefix, const char *name);
|
||||
|
||||
|
|
38
setup.c
38
setup.c
|
@ -61,6 +61,19 @@ const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
|
|||
return path;
|
||||
}
|
||||
|
||||
int check_filename(const char *prefix, const char *arg)
|
||||
{
|
||||
const char *name;
|
||||
struct stat st;
|
||||
|
||||
name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
|
||||
if (!lstat(name, &st))
|
||||
return 1; /* file exists */
|
||||
if (errno == ENOENT || errno == ENOTDIR)
|
||||
return 0; /* file does not exist */
|
||||
die_errno("failed to stat '%s'", arg);
|
||||
}
|
||||
|
||||
/*
|
||||
* Verify a filename that we got as an argument for a pathspec
|
||||
* entry. Note that a filename that begins with "-" never verifies
|
||||
|
@ -70,18 +83,12 @@ const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
|
|||
*/
|
||||
void verify_filename(const char *prefix, const char *arg)
|
||||
{
|
||||
const char *name;
|
||||
struct stat st;
|
||||
|
||||
if (*arg == '-')
|
||||
die("bad flag '%s' used after filename", arg);
|
||||
name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
|
||||
if (!lstat(name, &st))
|
||||
if (check_filename(prefix, arg))
|
||||
return;
|
||||
if (errno == ENOENT)
|
||||
die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
|
||||
"Use '--' to separate paths from revisions", arg);
|
||||
die_errno("failed to stat '%s'", arg);
|
||||
die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
|
||||
"Use '--' to separate paths from revisions", arg);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -91,19 +98,14 @@ void verify_filename(const char *prefix, const char *arg)
|
|||
*/
|
||||
void verify_non_filename(const char *prefix, const char *arg)
|
||||
{
|
||||
const char *name;
|
||||
struct stat st;
|
||||
|
||||
if (!is_inside_work_tree() || is_inside_git_dir())
|
||||
return;
|
||||
if (*arg == '-')
|
||||
return; /* flag */
|
||||
name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
|
||||
if (!lstat(name, &st))
|
||||
die("ambiguous argument '%s': both revision and filename\n"
|
||||
"Use '--' to separate filenames from revisions", arg);
|
||||
if (errno != ENOENT && errno != ENOTDIR)
|
||||
die_errno("failed to stat '%s'", arg);
|
||||
if (!check_filename(prefix, arg))
|
||||
return;
|
||||
die("ambiguous argument '%s': both revision and filename\n"
|
||||
"Use '--' to separate filenames from revisions", arg);
|
||||
}
|
||||
|
||||
const char **get_pathspec(const char *prefix, const char **pathspec)
|
||||
|
|
Loading…
Reference in a new issue