diff options
| author | Stefan Beller <sbeller@google.com> | 2017-05-02 21:32:12 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-04 06:42:04 +0200 |
| commit | a17062cf42556593fb73547e613b0be867026257 (patch) | |
| tree | 170e9bdadb5b0203983c5816d21acc9cb1c79611 /submodule.c | |
| parent | Merging a handful of topics before -rc2 (diff) | |
| download | git-a17062cf42556593fb73547e613b0be867026257.tar.xz git-a17062cf42556593fb73547e613b0be867026257.zip | |
submodule_move_head: reuse child_process structure for futher commands
We do not need to declare another struct child_process, but we can just
reuse the existing `cp` struct.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/submodule.c b/submodule.c index d3299e29c0..a2377ce019 100644 --- a/submodule.c +++ b/submodule.c @@ -1468,15 +1468,15 @@ int submodule_move_head(const char *path, if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) { if (new) { - struct child_process cp1 = CHILD_PROCESS_INIT; + child_process_init(&cp); /* also set the HEAD accordingly */ - cp1.git_cmd = 1; - cp1.no_stdin = 1; - cp1.dir = path; + cp.git_cmd = 1; + cp.no_stdin = 1; + cp.dir = path; - argv_array_pushl(&cp1.args, "update-ref", "HEAD", new, NULL); + argv_array_pushl(&cp.args, "update-ref", "HEAD", new, NULL); - if (run_command(&cp1)) { + if (run_command(&cp)) { ret = -1; goto out; } |