Merge pull request #456 from alexjacks92/develop

Added reset command before checkout.
This commit is contained in:
Richard Cordovano 2014-01-27 13:18:22 -08:00
commit c7cfe7dceb

View File

@ -78,6 +78,9 @@ def gitPull(TskOrAutopsy, branch):
ccwd = os.path.join("..", "..", "..", "sleuthkit")
else:
ccwd = os.path.join("..", "..")
print("Resetting " + TskOrAutopsy)
call = ["git", "reset", "--hard"]
subprocess.call(call, stdout=sys.stdout, cwd=ccwd)
print("Checking out " + branch)
call = ["git", "checkout", branch]
subprocess.call(call, stdout=sys.stdout, cwd=ccwd)