undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule_move_head: reuse child_process structure for futher commands

Browse Source 
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>
This commit is contained in:
Stefan Beller 2017-05-02 12:32:12 -07:00 committed by Junio C Hamano
parent d2bbb7c2bc
commit a17062cf42
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
submodule.c
View File

@ -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;
}