From 0b904d982f07429a71a65898771b3dabf8402693 Mon Sep 17 00:00:00 2001 From: sullrich Date: Fri, 4 Dec 2009 21:01:16 -0500 Subject: No need for duplicate command --- etc/phpshellsessions/gitsync | 2 -- 1 file changed, 2 deletions(-) (limited to 'etc') diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index 156545e..57f785f 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -124,11 +124,9 @@ if(is_dir("$CODIR/pfSenseGITREPO/pfSenseGITREPO")) { if($branch == "master") { exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard HEAD"); exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git rebase origin"); - exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard $branch"); } else { exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard HEAD"); exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git rebase origin/$branch"); - exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard origin/$branch"); } } else { exec("mkdir -p $CODIR/pfSenseGITREPO"); -- cgit v1.1