Browse Source

Prevent committing bad files

Avoid backup, lock, autosave files
Avoid files that are not visible to KiCad (outside of the project
directory/sub-directories)

Fixes https://gitlab.com/kicad/code/kicad/-/issues/19891
9.0
Seth Hillbrand 8 months ago
parent
commit
088a90cf68
  1. 20
      kicad/project_tree_pane.cpp

20
kicad/project_tree_pane.cpp

@ -2236,6 +2236,26 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
wxCHECK2_MSG( false, continue, "File status with neither git_status_entry set!" );
}
// Do not commit files outside the project directory
if( !fn.GetPath().StartsWith( Prj().GetProjectPath() ) )
continue;
// Skip lock files
if( fn.GetExt().CmpNoCase( FILEEXT::LockFileExtension ) == 0 )
continue;
// Skip autosave, lock, and backup files
if( fn.GetName().StartsWith( FILEEXT::AutoSaveFilePrefix )
|| fn.GetName().StartsWith( FILEEXT::LockFilePrefix )
|| fn.GetName().EndsWith( FILEEXT::BackupFileSuffix ) )
{
continue;
}
// Skip archived project backups
if( fn.GetPath().Contains( Prj().GetProjectName() + wxT( "-backups" ) ) )
continue;
if( aEvent.GetId() == ID_GIT_COMMIT_PROJECT )
{
modifiedFiles.emplace( filePath, entry->status );

Loading…
Cancel
Save