From 684893108e1f211dab9f1c588fd97f8bf09f0de5 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Thu, 9 May 2024 21:58:30 -0700 Subject: [PATCH] Make sure the submodule is checked out --- src/python/replay_merge.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py index 1a590dd919..729f417527 100755 --- a/src/python/replay_merge.py +++ b/src/python/replay_merge.py @@ -292,6 +292,7 @@ def merge_replay( os.getcwd(), "src/scripts/merge_tools" ) os.environ["GIT_CONFIG_GLOBAL"] = os.getcwd() + "/.gitconfig" + os.system("git submodule update --init") logger.info(f"Replaying merge with index {args.idx}") if args.delete_workdir: