Merge pull request #427 from online-judge-tools/fix/git-pull-first

git pull first
online-judge-tools · Dec 7, 2023 · b429a1a · b429a1a
2 parents 18f853d + ca3485d
commit b429a1a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/onlinejudge_verify/main.py b/onlinejudge_verify/main.py
@@ -98,7 +98,8 @@ def push_timestamp_to_branch() -> None:
     subprocess.check_call(['git', 'config', '--global', 'user.name', 'GitHub'])
     subprocess.check_call(['git', 'config', '--global', 'user.email', '[email protected]'])
     path = onlinejudge_verify.marker.get_verification_marker().json_path
-    logger.info('$ git add %s && git commit && git push', str(path))
+    logger.info('$ git pull && git add %s && git commit && git push', str(path))
+    subprocess.check_call(['git', 'pull'])
     if path.exists():
         subprocess.check_call(['git', 'add', str(path)])
     if subprocess.run(['git', 'diff', '--quiet', '--staged'], check=False).returncode: