Skip to content

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

Merged
olehermanse merged 1 commit into
cfengine:masterfrom
SimonThalvorsen:ENT-14302
Jul 22, 2026
Merged

ENT-14302: Added a check for .git-dir inside masterfiles-* when using cfbs convert to avoid crashing#324
olehermanse merged 1 commit into
cfengine:masterfrom
SimonThalvorsen:ENT-14302

Conversation

@SimonThalvorsen

Copy link
Copy Markdown
Contributor

Ticket: ENT-14302

…`cfbs convert` to avoid crashing

Ticket: ENT-14302
Signed-off-by: Simon Halvorsen <simon.halvorsen@northern.tech>

@larsewi larsewi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should it perhaps just skip initializing a new git repository instead of asking you to remove the existing .git directory? I'm guessing that if you want to convert an existing git repository, you'd still want to keep the original git history.

@olehermanse

olehermanse commented Jul 22, 2026

Copy link
Copy Markdown
Member

Should it perhaps just skip initializing a new git repository instead of asking you to remove the existing .git directory? I'm guessing that if you want to convert an existing git repository, you'd still want to keep the original git history.

That would require a bit more work - need to "rename" all the existing files in git, make another commit, so that they are in a subdir, etc.

Also, depends on what the user wants. Some users might want to "start fresh" in this case, while others will want to convert / retain their original git repo.

https://northerntech.atlassian.net/browse/CFE-4700

@olehermanse
olehermanse merged commit 8005588 into cfengine:master Jul 22, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants