diff options
author | John Keeping <john@keeping.me.uk> | 2013-03-02 12:32:11 +0000 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2013-03-02 10:38:03 -0500 |
commit | c1633c6befb6762e1ac9434a29980e4df5ffee21 (patch) | |
tree | 20dbdeab1f74e138a7db58a7ffb9ce304dcf3146 /ui-tree.c | |
parent | bfc14d067da0fdf65f306fcd9a65829d9694dbeb (diff) |
Update git to v1.7.6.5
struct pathspec is now used in more places.
Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-tree.c')
-rw-r--r-- | ui-tree.c | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -202,6 +202,9 @@ static void ls_tail() static void ls_tree(const unsigned char *sha1, char *path) { struct tree *tree; + struct pathspec paths = { + .nr = 0 + }; tree = parse_tree_indirect(sha1); if (!tree) { @@ -211,7 +214,7 @@ static void ls_tree(const unsigned char *sha1, char *path) } ls_head(); - read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL); + read_tree_recursive(tree, "", 0, 1, &paths, ls_item, NULL); ls_tail(); } @@ -252,7 +255,14 @@ void cgit_print_tree(const char *rev, char *path) { unsigned char sha1[20]; struct commit *commit; - const char *paths[] = {path, NULL}; + struct pathspec_item path_items = { + .match = path, + .len = path ? strlen(path) : 0 + }; + struct pathspec paths = { + .nr = path ? 1 : 0, + .items = &path_items + }; if (!rev) rev = ctx.qry.head; @@ -274,6 +284,6 @@ void cgit_print_tree(const char *rev, char *path) } match_path = path; - read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL); ls_tail(); } |