mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-01-25 00:43:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

sequencer: use argv_array in reset_merge

Browse Source 
Avoid using magic numbers for array size and index under `reset_merge`
function. Use `argv_array` instead. This will make code shorter and
easier to extend.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Rohit Ashiwal 2019-07-02 14:41:27 +05:30 committed by Junio C Hamano
parent 918d1e6ed8
commit 265ab48f26
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sequencer.c
View File

@ -2734,13 +2734,18 @@ static int rollback_is_safe(void)
static int reset_merge(const struct object_id *oid)
{
const char *argv[4]; /* reset --merge <arg> + NULL */
int ret;
struct argv_array argv = ARGV_ARRAY_INIT;
argv[0] = "reset";
argv[1] = "--merge";
argv[2] = oid_to_hex(oid);
argv[3] = NULL;
return run_command_v_opt(argv, RUN_GIT_CMD);
argv_array_pushl(&argv, "reset", "--merge", NULL);
if (!is_null_oid(oid))
argv_array_push(&argv, oid_to_hex(oid));
ret = run_command_v_opt(argv.argv, RUN_GIT_CMD);
argv_array_clear(&argv);
return ret;
}
static int rollback_single_pick(struct repository *r)