summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2024-01-02 20:39:44 +0200
committerLars Wirzenius <liw@liw.fi>2024-01-02 20:39:44 +0200
commit8f95c76a46e4891f89379d4fd62952f42cfa2086 (patch)
treee86f0f8c325f698e45143561ce7e30436dfeb878
parent4c6f9e0d40d15ccf3dba4a8889805738fc9c577c (diff)
downloadwumpus-hunter-8f95c76a46e4891f89379d4fd62952f42cfa2086.tar.gz
fix: do not change code in a hurry: actually update from origin
Signed-off-by: Lars Wirzenius <liw@liw.fi>
-rwxr-xr-xwumpus-hunter8
1 files changed, 1 insertions, 7 deletions
diff --git a/wumpus-hunter b/wumpus-hunter
index e6600cb..d7431e2 100755
--- a/wumpus-hunter
+++ b/wumpus-hunter
@@ -75,12 +75,11 @@ def get_code(url, ref, dirname):
if not os.path.exists(dirname):
git_clone(url, dirname)
git_checkout(dirname, ref)
- git_puill(dirname)
else:
git_clean(dirname)
git_checkout(dirname, ref)
git_remote_update(url, dirname)
- git_reset(dirname, ref)
+ git_reset(dirname, f"origin/{ref}")
git_status(dirname)
git_show_head(dirname)
return get_commit(dirname)
@@ -91,11 +90,6 @@ def git_clone(url, dirname):
git("clone", url, dirname)
-def git_pull(dirname):
- logging.info(f"pull in {dirname}")
- git("pull", dirname)
-
-
def git_checkout(dirname, ref):
logging.info(f"checkout {ref} in {dirname}")
git("checkout", ref, cwd=dirname)