Skip to content

ENT-14302: Added a check for .git-dir inside masterfiles-* when using cfbs convert to avoid crashing #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olehermanse merged 1 commit into from
Jul 22, 2026
Merged

ENT-14302: Added a check for .git-dir inside masterfiles-* when using cfbs convert to avoid crashing #324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions cfbs/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,6 +1225,15 @@ def cfbs_convert_git_commit(

dir_name = dir_content[0]
path_string = "./" + dir_name + "/"
has_gitfolder = os.path.isdir(os.path.join(path_string, ".git"))
if has_gitfolder:
print(
"A `.git`-directory already exists inside %s and it will not be possible to initialize a cfbs-project"
% path_string
)
if not prompt_user_yesno(non_interactive, "Do you want to remove this?"):
raise CFBSExitError("`.git`-directory was not removed, exiting.")
rm(os.path.join(path_string, ".git"))

# validate the local module
validate_module_name_content(path_string)
Expand Down Expand Up @@ -1282,6 +1291,7 @@ def cfbs_convert_git_commit(
print("Initializing a new CFBS project...")
# since there should be no other files than the masterfiles-name directory, there shouldn't be a .git directory
assert not is_git_repo()
assert not is_git_repo(path_string)
try:
r = init_command(
masterfiles="no", non_interactive=non_interactive, use_git=True
Expand Down
Loading