diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-27 07:23:08 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-27 07:23:08 -0300 |
| commit | 5563e8ba736bee091959ecafd0455b0dd48fcac5 (patch) | |
| tree | 15c71cc7eafeb933642b1e4a20596f0036e8dddb /src/etc/phpshellsessions | |
| parent | bcee456cb1fd2f8aa563214efb057ad74a4b084a (diff) | |
| download | pfsense-5563e8ba736bee091959ecafd0455b0dd48fcac5.zip pfsense-5563e8ba736bee091959ecafd0455b0dd48fcac5.tar.gz | |
Make gitsync work with new repo structure, copying files under src/. It should fix #4999
Diffstat (limited to 'src/etc/phpshellsessions')
| -rw-r--r-- | src/etc/phpshellsessions/gitsync | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync index ec890b2..6ece718 100644 --- a/src/etc/phpshellsessions/gitsync +++ b/src/etc/phpshellsessions/gitsync @@ -296,9 +296,9 @@ if (isset($args["--minimal"])) { } else if (file_exists("/etc/version.lastcommit")) { $old_revision = trim(file_get_contents("/etc/version.lastcommit")); } - $files_to_copy = strtr(shell_exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && {$GIT_BIN} diff --name-only " . escapeshellarg($old_revision)), "\n", " "); + $files_to_copy = strtr(shell_exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && {$GIT_BIN} diff --name-only --relative=src " . escapeshellarg($old_revision)), "\n", " "); } else { - $files_to_copy = '--exclude .git .'; + $files_to_copy = '-C ./src .'; } // Save new commit ID for later minimal file copies |
