From: Jason Etheridge Date: Thu, 19 Sep 2013 14:56:34 +0000 (-0400) Subject: git pull in the webifier X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d2c67e578787b417d1a818b89cb8f71aee6f9da5;p=working%2Frandom.git git pull in the webifier Signed-off-by: Jason Etheridge --- diff --git a/qa/test_output_webifier.pl b/qa/test_output_webifier.pl index 264d88430..6a38254db 100755 --- a/qa/test_output_webifier.pl +++ b/qa/test_output_webifier.pl @@ -163,9 +163,9 @@ sub branch_tips { my $prev_evergreen_tip_hash = `cat prev_evergreen_tip.hash`; chop $prev_evergreen_tip_hash; $html .= "

OpenSRF commits since last build:

\n
";
-    $html .= `cd ~/git/OpenSRF/ ; git fetch 2> /dev/null ; git log --format=oneline $prev_opensrf_tip_hash..$opensrf_tip_hash`;
+    $html .= `cd ~/git/OpenSRF/ ; git fetch 2> /dev/null ; git pull 2> /dev/null ; git log --format=oneline $prev_opensrf_tip_hash..$opensrf_tip_hash`;
     $html .= "

Evergreen commits since last build:

\n
";
-    $html .= `cd ~/git/Evergreen/ ; git fetch 2> /dev/null ; git log --format=oneline $prev_evergreen_tip_hash..$evergreen_tip_hash`;
+    $html .= `cd ~/git/Evergreen/ ; git fetch 2> /dev/null ; git pull 2> /dev/null ; git log --format=oneline $prev_evergreen_tip_hash..$evergreen_tip_hash`;
     `echo $opensrf_tip_hash > prev_opensrf_tip.hash`;
     `echo $evergreen_tip_hash > prev_evergreen_tip.hash`;
     $html .= "
\n";