diff options
author | Christian Hesse | 2020-10-06 16:32:08 +0200 |
---|---|---|
committer | Christian Hesse | 2020-10-19 20:27:28 +0200 |
commit | 629659d2cffbf059374fc53e6400ff0bebe1ddde (patch) | |
tree | 5447658c87e9aa4331e36ace5ebe295d9ed2952e /ui-blame.c | |
parent | 205837d4684f331afa93c946cbdfa1fa9b3d1ce9 (diff) | |
download | cgit-629659d2cffbf059374fc53e6400ff0bebe1ddde.tar.gz cgit-629659d2cffbf059374fc53e6400ff0bebe1ddde.tar.bz2 cgit-629659d2cffbf059374fc53e6400ff0bebe1ddde.zip |
git: update to v2.29.0
Update to git version v2.29.0, this requires changes for these
upstream commits:
* dbbcd44fb47347a3fdbee88ea21805b7f4ac0b98
strvec: rename files from argv-array to strvec
* 873cd28a8b17ff21908c78c7929a7615f8c94992
argv-array: rename to strvec
* d70a9eb611a9d242c1d26847d223b8677609305b
strvec: rename struct fields
* 6a67c759489e1025665adf78326e9e0d0981bab5
test-lib-functions: restrict test_must_fail usage
Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-blame.c')
-rw-r--r-- | ui-blame.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -10,7 +10,7 @@ | |||
10 | #include "ui-blame.h" | 10 | #include "ui-blame.h" |
11 | #include "html.h" | 11 | #include "html.h" |
12 | #include "ui-shared.h" | 12 | #include "ui-shared.h" |
13 | #include "argv-array.h" | 13 | #include "strvec.h" |
14 | #include "blame.h" | 14 | #include "blame.h" |
15 | 15 | ||
16 | 16 | ||
@@ -104,7 +104,7 @@ static void print_object(const struct object_id *oid, const char *path, | |||
104 | enum object_type type; | 104 | enum object_type type; |
105 | char *buf; | 105 | char *buf; |
106 | unsigned long size; | 106 | unsigned long size; |
107 | struct argv_array rev_argv = ARGV_ARRAY_INIT; | 107 | struct strvec rev_argv = STRVEC_INIT; |
108 | struct rev_info revs; | 108 | struct rev_info revs; |
109 | struct blame_scoreboard sb; | 109 | struct blame_scoreboard sb; |
110 | struct blame_origin *o; | 110 | struct blame_origin *o; |
@@ -124,11 +124,11 @@ static void print_object(const struct object_id *oid, const char *path, | |||
124 | return; | 124 | return; |
125 | } | 125 | } |
126 | 126 | ||
127 | argv_array_push(&rev_argv, "blame"); | 127 | strvec_push(&rev_argv, "blame"); |
128 | argv_array_push(&rev_argv, rev); | 128 | strvec_push(&rev_argv, rev); |
129 | init_revisions(&revs, NULL); | 129 | init_revisions(&revs, NULL); |
130 | revs.diffopt.flags.allow_textconv = 1; | 130 | revs.diffopt.flags.allow_textconv = 1; |
131 | setup_revisions(rev_argv.argc, rev_argv.argv, &revs, NULL); | 131 | setup_revisions(rev_argv.nr, rev_argv.v, &revs, NULL); |
132 | init_scoreboard(&sb); | 132 | init_scoreboard(&sb); |
133 | sb.revs = &revs; | 133 | sb.revs = &revs; |
134 | sb.repo = the_repository; | 134 | sb.repo = the_repository; |