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-blob.c | |
| parent | Update git to v1.7.5.4 (diff) | |
| download | cgit-pink-c1633c6befb6762e1ac9434a29980e4df5ffee21.tar.gz cgit-pink-c1633c6befb6762e1ac9434a29980e4df5ffee21.zip | |
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-blob.c')
| -rw-r--r-- | ui-blob.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/ui-blob.c b/ui-blob.c index ec435e1..3de4473 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -32,7 +32,14 @@ int cgit_print_file(char *path, const char *head) char *buf; unsigned long size; struct commit *commit; - const char *paths[] = {path, NULL}; + struct pathspec_item path_items = { + .match = path, + .len = strlen(path) + }; + struct pathspec paths = { + .nr = 1, + .items = &path_items + }; if (get_sha1(head, sha1)) return -1; type = sha1_object_info(sha1, &size); @@ -41,7 +48,7 @@ int cgit_print_file(char *path, const char *head) match_path = path; matched_sha1 = sha1; found_path = 0; - read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL); if (!found_path) return -1; type = sha1_object_info(sha1, &size); @@ -63,7 +70,14 @@ void cgit_print_blob(const char *hex, char *path, const char *head) char *buf; unsigned long size; struct commit *commit; - const char *paths[] = {path, NULL}; + struct pathspec_item path_items = { + .match = path, + .len = strlen(path) + }; + struct pathspec paths = { + .nr = 1, + .items = &path_items + }; if (hex) { if (get_sha1_hex(hex, sha1)){ @@ -83,7 +97,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head) commit = lookup_commit_reference(sha1); match_path = path; matched_sha1 = sha1; - read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL); type = sha1_object_info(sha1,&size); } |