From: Jan Michel <j.michel@gsi.de> Date: Sat, 3 Aug 2013 20:36:32 +0000 (+0200) Subject: added links to start page, option to stay at current branch during checkout X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=551238783b7b87966d6539bc58a803544ff12396;p=mvdsensorcontrol.git added links to start page, option to stay at current branch during checkout --- diff --git a/index.pl b/index.pl index 0a2a008..c7dfc82 100755 --- a/index.pl +++ b/index.pl @@ -27,15 +27,18 @@ Guess what? We didn't write any! <h3>Monitoring and Control Features</h3> <div class="index"> -<ul><a href="tools/jtageditor.pl">Edit JTAG configuration files</a> -<li><a href=""></a> +<ul> +<li><a href="tools/jtageditor.pl">Edit JTAG configuration files</a> +<li><a href="tools/testgui.pl">Quick Analysis of sensor data</a> +<li><a href="http://cerberus.x-matter.uni-frankfurt.de:8000/tools/pwr">Power Supply Control</a> </ul> </div> <h3>Update</h3> <div class="index"> <ul> -<li><a href="tools/gitupdate.pl?master">Check-out the stable branch without config files</a> +<li><a href="tools/gitupdate.pl?master">Check-out the master branch without config files</a> +<li><a href="tools/gitupdate.pl?current">Check-out the currently selected branch without config files</a> <li>Check-out the stable branch including config files: add -config to URL </div> diff --git a/tools/gitupdate.pl b/tools/gitupdate.pl index 1bbf858..246db14 100755 --- a/tools/gitupdate.pl +++ b/tools/gitupdate.pl @@ -39,8 +39,10 @@ cmd("git checkout -- ../config ../temp"); print "Pulling new data from server\n"; cmd("git pull "); -print "Changing to branch $commands[0].\n"; -cmd("git checkout $commands[0]"); +unless($commands[0] eq "current") { + print "Changing to branch $commands[0].\n"; + cmd("git checkout $commands[0]"); + } unless (defined $commands[1] && $commands[1] eq "config") {