From 5563e8ba736bee091959ecafd0455b0dd48fcac5 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 27 Aug 2015 07:23:08 -0300 Subject: [PATCH] Make gitsync work with new repo structure, copying files under src/. It should fix #4999 --- src/etc/phpshellsessions/gitsync | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync index ec890b22be..6ece718126 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