diff options
| author | Christian Hesse <mail@eworm.de> | 2020-10-06 16:32:08 +0200 | 
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2020-10-19 20:27:28 +0200 | 
| commit | 629659d2cffbf059374fc53e6400ff0bebe1ddde (patch) | |
| tree | 5447658c87e9aa4331e36ace5ebe295d9ed2952e /ui-blame.c | |
| parent | git: update to v2.28.0 (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 '')
| -rw-r--r-- | ui-blame.c | 10 | 
1 files changed, 5 insertions, 5 deletions
| @@ -10,7 +10,7 @@  #include "ui-blame.h"  #include "html.h"  #include "ui-shared.h" -#include "argv-array.h" +#include "strvec.h"  #include "blame.h" @@ -104,7 +104,7 @@ static void print_object(const struct object_id *oid, const char *path,  	enum object_type type;  	char *buf;  	unsigned long size; -	struct argv_array rev_argv = ARGV_ARRAY_INIT; +	struct strvec rev_argv = STRVEC_INIT;  	struct rev_info revs;  	struct blame_scoreboard sb;  	struct blame_origin *o; @@ -124,11 +124,11 @@ static void print_object(const struct object_id *oid, const char *path,  		return;  	} -	argv_array_push(&rev_argv, "blame"); -	argv_array_push(&rev_argv, rev); +	strvec_push(&rev_argv, "blame"); +	strvec_push(&rev_argv, rev);  	init_revisions(&revs, NULL);  	revs.diffopt.flags.allow_textconv = 1; -	setup_revisions(rev_argv.argc, rev_argv.argv, &revs, NULL); +	setup_revisions(rev_argv.nr, rev_argv.v, &revs, NULL);  	init_scoreboard(&sb);  	sb.revs = &revs;  	sb.repo = the_repository; | 
