| 3475 | } |
| 3476 | |
| 3477 | static int reset_merge(const struct object_id *oid) |
| 3478 | { |
| 3479 | struct child_process cmd = CHILD_PROCESS_INIT; |
| 3480 | |
| 3481 | cmd.git_cmd = 1; |
| 3482 | strvec_pushl(&cmd.args, "reset", "--merge", NULL); |
| 3483 | |
| 3484 | if (!is_null_oid(oid)) |
| 3485 | strvec_push(&cmd.args, oid_to_hex(oid)); |
| 3486 | |
| 3487 | return run_command(&cmd); |
| 3488 | } |
| 3489 | |
| 3490 | static int rollback_single_pick(struct repository *r) |
| 3491 | { |
no test coverage detected