|
|
@ -94,6 +94,10 @@ class Update:
|
|
|
|
git.checkoutBranch(rpath, branch)
|
|
|
|
git.checkoutBranch(rpath, branch)
|
|
|
|
if revision == "last":
|
|
|
|
if revision == "last":
|
|
|
|
if git.resetRepository(rpath, to_origin=True):
|
|
|
|
if git.resetRepository(rpath, to_origin=True):
|
|
|
|
|
|
|
|
# если не удалось сбросить
|
|
|
|
|
|
|
|
repInfo = git.getStatusInfo(rpath)
|
|
|
|
|
|
|
|
if repInfo.get("files", False):
|
|
|
|
|
|
|
|
raise GitError("Failed to reset git")
|
|
|
|
needMeta = True
|
|
|
|
needMeta = True
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
git.resetRepository(rpath, to_rev=revision)
|
|
|
|
git.resetRepository(rpath, to_rev=revision)
|
|
|
|