Skip to content

Commit

Permalink
fix: unshallow and merge main into extra dirs
Browse files Browse the repository at this point in the history
When extra-dirs is used we also need to apply main branch into each
directory.

Signed-off-by: Sébastien Han <[email protected]>
  • Loading branch information
leseb committed Dec 18, 2024
1 parent 9dad6e9 commit 200fe27
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions depends_on_stage2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 200fe27

Please sign in to comment.