diff options
author | Erik Fonnesbeck <efonnes@gmail.com> | 2012-09-17 06:33:24 -0600 |
---|---|---|
committer | Erik Fonnesbeck <efonnes@gmail.com> | 2012-11-20 22:35:27 -0700 |
commit | 2fb548667ac946d985634937ee6b953767970df3 (patch) | |
tree | 183cd00900d7be8732ab7d85bfbf493afaaa4f4e /etc | |
parent | f16a622038244e1324f0cc2952d8d1f3981296df (diff) | |
download | pfsense-2fb548667ac946d985634937ee6b953767970df3.zip pfsense-2fb548667ac946d985634937ee6b953767970df3.tar.gz |
Fix special build_commit tag that was broken from previous change to how it read the file with the commit ID.
Backport of c578fb0fc6e768739013df8d7aa19f2616272f18
Diffstat (limited to 'etc')
-rw-r--r-- | etc/phpshellsessions/gitsync | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index feb6f21..97757c7 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -215,7 +215,7 @@ if($branch == "build_commit") { $git_cmd = array( "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git branch " . escapeshellarg($branch) . " 2>/dev/null", "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -f " . escapeshellarg($branch) . " 2>/dev/null", - "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard " . escapeshellarg(file_get_contents("/etc/version.lastcommit")) + "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard " . escapeshellarg(trim(file_get_contents("/etc/version.lastcommit"))) ); } else { $git_cmd = array( |