From 200fe2797aed59d9c81af73c934437fba95e0d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 17 Dec 2024 12:20:26 +0100 Subject: [PATCH] fix: unshallow and merge main into extra dirs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When extra-dirs is used we also need to apply main branch into each directory. Signed-off-by: Sébastien Han --- depends_on_stage2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/depends_on_stage2 b/depends_on_stage2 index b3f7a30..bf9483a 100755 --- a/depends_on_stage2 +++ b/depends_on_stage2 @@ -141,6 +141,9 @@ def main(check_mode): real_extra_dirs = [] for extra_dir in data["extra_dirs"]: real_extra_dir = os.path.realpath(extra_dir) + if not check_mode: + unshallow(real_extra_dir, data["main_branch"]) + merge_main_branch(real_extra_dir, data["main_branch"]) if not os.path.isdir(real_extra_dir): log(f"Extra directory {real_extra_dir} does not exist.") return 1