From 2d501e8f49b0fddc536dba91436fc32540707e6f Mon Sep 17 00:00:00 2001
From: Rob Nelson <nexisentertainment@gmail.com>
Date: Wed, 14 Aug 2013 16:26:49 -0700
Subject: [PATCH] Fix looping updates.

---
 DLLSocket/server_controller.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/DLLSocket/server_controller.py b/DLLSocket/server_controller.py
index 8f6c8f1a1da..aa875cdb2eb 100644
--- a/DLLSocket/server_controller.py
+++ b/DLLSocket/server_controller.py
@@ -44,10 +44,10 @@ def git_branch():
 	return '[UNKNOWN]'
 	
 def checkForUpdate(serverState):
-	global GIT_REMOTE,GIT_BRANCH,COMPILE_COMMAND,GAMEPATH,CONFIGPATH
+	global GIT_REMOTE,GIT_BRANCH,COMPILE_COMMAND,GAMEPATH,CONFIGPATH,lastCommit
 	cwd=os.getcwd()
 	os.chdir(GAMEPATH)
-	subprocess.call('git pull -s recursive -Xtheirs {0} {1}'.format(GIT_REMOTE,GIT_BRANCH),shell=True)
+	subprocess.call('git pull -q -s recursive -Xtheirs {0} {1}'.format(GIT_REMOTE,GIT_BRANCH),shell=True)
 	subprocess.call('git checkout -q {0}'.format(GIT_BRANCH),shell=True) 
 	currentCommit = git_commit()
 	currentBranch = git_branch()
@@ -66,6 +66,7 @@ def checkForUpdate(serverState):
 		else:
 			if os.path.isfile(updateTrigger):
 				os.remove(updateTrigger)
+	lastCommit=currentCommit
 	os.chdir(cwd)
 
 # Return True for success, False otherwise.