mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bundle: use argv-array

Browse Source 
Instead of hand-crafted arrays to manage command line arguments
we create internally, use argv-array helpers.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2013-11-12 13:32:11 -08:00
parent 706150404d
commit 1e2371ea66
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bundle.c
View File

@ -7,6 +7,7 @@
#include "list-objects.h" #include "list-objects.h"
#include "run-command.h" #include "run-command.h"
#include "refs.h" #include "refs.h"
#include "argv-array.h"
static const char bundle_signature[] = "# v2 git bundle\n"; static const char bundle_signature[] = "# v2 git bundle\n";
@ -239,8 +240,8 @@ int create_bundle(struct bundle_header *header, const char *path,
static struct lock_file lock; static struct lock_file lock;
int bundle_fd = -1; int bundle_fd = -1;
int bundle_to_stdout; int bundle_to_stdout;
const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *)); struct argv_array argv_boundary = ARGV_ARRAY_INIT;
const char **argv_pack = xmalloc(6 * sizeof(const char *)); struct argv_array argv_pack = ARGV_ARRAY_INIT;
int i, ref_count = 0; int i, ref_count = 0;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct rev_info revs; struct rev_info revs;
@ -262,13 +263,14 @@ int create_bundle(struct bundle_header *header, const char *path,
init_revisions(&revs, NULL); init_revisions(&revs, NULL);
/* write prerequisites */ /* write prerequisites */
memcpy(argv_boundary + 3, argv + 1, argc * sizeof(const char *)); argv_array_pushl(&argv_boundary,
argv_boundary[0] = "rev-list"; "rev-list", "--boundary", "--pretty=oneline",
argv_boundary[1] = "--boundary"; NULL);
argv_boundary[2] = "--pretty=oneline"; for (i = 1; i < argc; i++)
argv_boundary[argc + 2] = NULL; argv_array_push(&argv_boundary, argv[i]);
memset(&rls, 0, sizeof(rls)); memset(&rls, 0, sizeof(rls));
rls.argv = argv_boundary; rls.argv = argv_boundary.argv;
rls.out = -1; rls.out = -1;
rls.git_cmd = 1; rls.git_cmd = 1;
if (start_command(&rls)) if (start_command(&rls))
@ -383,14 +385,12 @@ int create_bundle(struct bundle_header *header, const char *path,
write_or_die(bundle_fd, "\n", 1); write_or_die(bundle_fd, "\n", 1);
/* write pack */ /* write pack */
argv_pack[0] = "pack-objects"; argv_array_pushl(&argv_pack,
argv_pack[1] = "--all-progress-implied"; "pack-objects", "--all-progress-implied",
argv_pack[2] = "--stdout"; "--stdout", "--thin", "--delta-base-offset",
argv_pack[3] = "--thin"; NULL);
argv_pack[4] = "--delta-base-offset";
argv_pack[5] = NULL;
memset(&rls, 0, sizeof(rls)); memset(&rls, 0, sizeof(rls));
rls.argv = argv_pack; rls.argv = argv_pack.argv;
rls.in = -1; rls.in = -1;
rls.out = bundle_fd; rls.out = bundle_fd;
rls.git_cmd = 1; rls.git_cmd = 1;