git: update for v2.3.0
* sort_string_list(): rename to string_list_sort() (upstream commit 3383e199) * update read_tree_recursive callback to pass strbuf as base (upstream commit 6a0b0b6d) Signed-off-by: Christian Hesse <mail@eworm.de>
This commit is contained in:

committed by
Jason A. Donenfeld

부모
1a9e56607e
커밋
7358f63015
@ -18,15 +18,15 @@ struct walk_tree_context {
|
||||
int file_only:1;
|
||||
};
|
||||
|
||||
static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
|
||||
const char *pathname, unsigned mode, int stage, void *cbdata)
|
||||
static int walk_tree(const unsigned char *sha1, struct strbuf *base,
|
||||
const char *pathname, unsigned mode, int stage, void *cbdata)
|
||||
{
|
||||
struct walk_tree_context *walk_tree_ctx = cbdata;
|
||||
|
||||
if (walk_tree_ctx->file_only && !S_ISREG(mode))
|
||||
return READ_TREE_RECURSIVE;
|
||||
if (strncmp(base, walk_tree_ctx->match_path, baselen)
|
||||
|| strcmp(walk_tree_ctx->match_path + baselen, pathname))
|
||||
if (strncmp(base->buf, walk_tree_ctx->match_path, base->len)
|
||||
|| strcmp(walk_tree_ctx->match_path + base->len, pathname))
|
||||
return READ_TREE_RECURSIVE;
|
||||
memmove(walk_tree_ctx->matched_sha1, sha1, 20);
|
||||
walk_tree_ctx->found_path = 1;
|
||||
|
Reference in New Issue
Block a user