mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jc/clear-pathspec'
We usually call a function that clears the contents a data structure X without freeing the structure itself clear_X(), and call a function that does clear_X() and also frees it free_X(). free_pathspec() function has been renamed to clear_pathspec() to avoid confusion. * jc/clear-pathspec: pathspec: rename free_pathspec() to clear_pathspec()
This commit is contained in:
commit
1958a17fe4
|
@ -322,7 +322,7 @@ static int path_exists(struct tree *tree, const char *path)
|
|||
pathspec.recursive = 1;
|
||||
ret = read_tree_recursive(tree, "", 0, 0, &pathspec,
|
||||
reject_entry, &pathspec);
|
||||
free_pathspec(&pathspec);
|
||||
clear_pathspec(&pathspec);
|
||||
return ret != 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -609,7 +609,7 @@ static struct origin *find_origin(struct scoreboard *sb,
|
|||
}
|
||||
}
|
||||
diff_flush(&diff_opts);
|
||||
free_pathspec(&diff_opts.pathspec);
|
||||
clear_pathspec(&diff_opts.pathspec);
|
||||
return porigin;
|
||||
}
|
||||
|
||||
|
@ -651,7 +651,7 @@ static struct origin *find_rename(struct scoreboard *sb,
|
|||
}
|
||||
}
|
||||
diff_flush(&diff_opts);
|
||||
free_pathspec(&diff_opts.pathspec);
|
||||
clear_pathspec(&diff_opts.pathspec);
|
||||
return porigin;
|
||||
}
|
||||
|
||||
|
@ -1343,7 +1343,7 @@ static void find_copy_in_parent(struct scoreboard *sb,
|
|||
} while (unblamed);
|
||||
target->suspects = reverse_blame(leftover, NULL);
|
||||
diff_flush(&diff_opts);
|
||||
free_pathspec(&diff_opts.pathspec);
|
||||
clear_pathspec(&diff_opts.pathspec);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -158,7 +158,7 @@ static int read_from_tree(const struct pathspec *pathspec,
|
|||
return 1;
|
||||
diffcore_std(&opt);
|
||||
diff_flush(&opt);
|
||||
free_pathspec(&opt.pathspec);
|
||||
clear_pathspec(&opt.pathspec);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -759,7 +759,7 @@ static int do_reupdate(int ac, const char **av,
|
|||
if (save_nr != active_nr)
|
||||
goto redo;
|
||||
}
|
||||
free_pathspec(&pathspec);
|
||||
clear_pathspec(&pathspec);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -1525,7 +1525,7 @@ void diff_tree_combined(const unsigned char *sha1,
|
|||
free(tmp);
|
||||
}
|
||||
|
||||
free_pathspec(&diffopts.pathspec);
|
||||
clear_pathspec(&diffopts.pathspec);
|
||||
}
|
||||
|
||||
void diff_tree_combined_merge(const struct commit *commit, int dense,
|
||||
|
|
|
@ -170,7 +170,7 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
|
|||
sha1_to_hex(mp->remote));
|
||||
}
|
||||
diff_flush(&opt);
|
||||
free_pathspec(&opt.pathspec);
|
||||
clear_pathspec(&opt.pathspec);
|
||||
|
||||
*num_changes = len;
|
||||
return changes;
|
||||
|
@ -256,7 +256,7 @@ static void diff_tree_local(struct notes_merge_options *o,
|
|||
sha1_to_hex(mp->local));
|
||||
}
|
||||
diff_flush(&opt);
|
||||
free_pathspec(&opt.pathspec);
|
||||
clear_pathspec(&opt.pathspec);
|
||||
}
|
||||
|
||||
static void check_notes_merge_worktree(struct notes_merge_options *o)
|
||||
|
|
|
@ -489,7 +489,7 @@ void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
|
|||
sizeof(struct pathspec_item) * dst->nr);
|
||||
}
|
||||
|
||||
void free_pathspec(struct pathspec *pathspec)
|
||||
void clear_pathspec(struct pathspec *pathspec)
|
||||
{
|
||||
free(pathspec->items);
|
||||
pathspec->items = NULL;
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#define PATHSPEC_ONESTAR 1 /* the pathspec pattern satisfies GFNM_ONESTAR */
|
||||
|
||||
struct pathspec {
|
||||
const char **_raw; /* get_pathspec() result, not freed by free_pathspec() */
|
||||
const char **_raw; /* get_pathspec() result, not freed by clear_pathspec() */
|
||||
int nr;
|
||||
unsigned int has_wildcard:1;
|
||||
unsigned int recursive:1;
|
||||
|
@ -74,7 +74,7 @@ extern void parse_pathspec(struct pathspec *pathspec,
|
|||
const char *prefix,
|
||||
const char **args);
|
||||
extern void copy_pathspec(struct pathspec *dst, const struct pathspec *src);
|
||||
extern void free_pathspec(struct pathspec *);
|
||||
extern void clear_pathspec(struct pathspec *);
|
||||
|
||||
static inline int ps_strncmp(const struct pathspec_item *item,
|
||||
const char *s1, const char *s2, size_t n)
|
||||
|
|
|
@ -1425,7 +1425,7 @@ static void prepare_show_merge(struct rev_info *revs)
|
|||
ce_same_name(ce, active_cache[i+1]))
|
||||
i++;
|
||||
}
|
||||
free_pathspec(&revs->prune_data);
|
||||
clear_pathspec(&revs->prune_data);
|
||||
parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
|
||||
PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
|
||||
revs->limited = 1;
|
||||
|
|
|
@ -607,7 +607,7 @@ static void try_to_follow_renames(const unsigned char *old, const unsigned char
|
|||
diff_setup_done(&diff_opts);
|
||||
ll_diff_tree_sha1(old, new, base, &diff_opts);
|
||||
diffcore_std(&diff_opts);
|
||||
free_pathspec(&diff_opts.pathspec);
|
||||
clear_pathspec(&diff_opts.pathspec);
|
||||
|
||||
/* Go through the new set of filepairing, and see if we find a more interesting one */
|
||||
opt->found_follow = 0;
|
||||
|
@ -630,7 +630,7 @@ static void try_to_follow_renames(const unsigned char *old, const unsigned char
|
|||
/* Update the path we use from now on.. */
|
||||
path[0] = p->one->path;
|
||||
path[1] = NULL;
|
||||
free_pathspec(&opt->pathspec);
|
||||
clear_pathspec(&opt->pathspec);
|
||||
parse_pathspec(&opt->pathspec,
|
||||
PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
|
||||
PATHSPEC_LITERAL_PATH, "", path);
|
||||
|
|
Loading…
Reference in a new issue