undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

worktree.c: get_worktrees() takes a new flag argument

Browse Source 
This is another no-op patch, in preparation for get_worktrees() to do
optional things, like sorting.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2016-11-28 16:36:55 +07:00 committed by Junio C Hamano
parent a234563a3b
commit 4fff1ef7ff
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
branch.c
View File

@ -348,7 +348,7 @@ void die_if_checked_out(const char *branch, int ignore_current_worktree)
int replace_each_worktree_head_symref(const char *oldref, const char *newref) int replace_each_worktree_head_symref(const char *oldref, const char *newref)
{ {
int ret = 0; int ret = 0;
struct worktree **worktrees = get_worktrees(); struct worktree **worktrees = get_worktrees(0);
int i; int i;
for (i = 0; worktrees[i]; i++) { for (i = 0; worktrees[i]; i++) {

2
builtin/branch.c
View File

@ -531,7 +531,7 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
static void reject_rebase_or_bisect_branch(const char *target) static void reject_rebase_or_bisect_branch(const char *target)
{ {
struct worktree **worktrees = get_worktrees(); struct worktree **worktrees = get_worktrees(0);
int i; int i;
for (i = 0; worktrees[i]; i++) { for (i = 0; worktrees[i]; i++) {

6
builtin/worktree.c
View File

@ -447,7 +447,7 @@ static int list(int ac, const char **av, const char *prefix)
if (ac) if (ac)
usage_with_options(worktree_usage, options); usage_with_options(worktree_usage, options);
else { else {
struct worktree **worktrees = get_worktrees(); struct worktree **worktrees = get_worktrees(0);
int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i; int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;
if (!porcelain) if (!porcelain)
@ -478,7 +478,7 @@ static int lock_worktree(int ac, const char **av, const char *prefix)
if (ac != 1) if (ac != 1)
usage_with_options(worktree_usage, options); usage_with_options(worktree_usage, options);
worktrees = get_worktrees(); worktrees = get_worktrees(0);
wt = find_worktree(worktrees, prefix, av[0]); wt = find_worktree(worktrees, prefix, av[0]);
if (!wt) if (!wt)
die(_("'%s' is not a working tree"), av[0]); die(_("'%s' is not a working tree"), av[0]);
@ -511,7 +511,7 @@ static int unlock_worktree(int ac, const char **av, const char *prefix)
if (ac != 1) if (ac != 1)
usage_with_options(worktree_usage, options); usage_with_options(worktree_usage, options);
worktrees = get_worktrees(); worktrees = get_worktrees(0);
wt = find_worktree(worktrees, prefix, av[0]); wt = find_worktree(worktrees, prefix, av[0]);
if (!wt) if (!wt)
die(_("'%s' is not a working tree"), av[0]); die(_("'%s' is not a working tree"), av[0]);

4
worktree.c
View File

@ -160,7 +160,7 @@ static void mark_current_worktree(struct worktree **worktrees)
free(git_dir); free(git_dir);
} }
struct worktree **get_worktrees(void) struct worktree **get_worktrees(unsigned flags)
{ {
struct worktree **list = NULL; struct worktree **list = NULL;
struct strbuf path = STRBUF_INIT; struct strbuf path = STRBUF_INIT;
@ -327,7 +327,7 @@ const struct worktree *find_shared_symref(const char *symref,
if (worktrees) if (worktrees)
free_worktrees(worktrees); free_worktrees(worktrees);
worktrees = get_worktrees(); worktrees = get_worktrees(0);
for (i = 0; worktrees[i]; i++) { for (i = 0; worktrees[i]; i++) {
struct worktree *wt = worktrees[i]; struct worktree *wt = worktrees[i];

2
worktree.h
View File

@ -23,7 +23,7 @@ struct worktree {
* The caller is responsible for freeing the memory from the returned * The caller is responsible for freeing the memory from the returned
* worktree(s). * worktree(s).
*/ */
extern struct worktree **get_worktrees(void); extern struct worktree **get_worktrees(unsigned flags);
/* /*
* Return git dir of the worktree. Note that the path may be relative. * Return git dir of the worktree. Note that the path may be relative.