Bug: Files vanish when deleting current branch in Git plugin

Aperta
#278 0 commenti 0 reazioni 0 assegnatari Vedi su GitHub

Nessuno ha ancora preso questa issue.

Valutazione

Difficoltà
3/5
Tempo stimato
1-2 giorni
Idoneità per principianti
45/100
Tipo di issue
Bug
Chiarezza
Abbastanza chiara
Stato di attività
Ferma
Stack tecnologico
cpp, git, godot
Ambito
devtools

Direzione di ricerca

Inizia dall’azione "Remove Branch" del Commit Dock e riproduci la sequenza di creazione, selezione ed eliminazione del branch corrente in Godot 4.3 con Git plugin 3.1.1. Traccia come viene gestito il branch attivo durante la rimozione, quindi verifica che l’UI impedisca di eliminare il branch selezionato e che i file rimangano recuperabili dopo le operazioni sui branch.

Scritto dal modello di indicizzazione a partire dal testo della issue.

Descrizione

bug

Environment where the phenomenon occurred

GodotEngine v4.3.stable.official [77dcf97d8]
Git plugin v3.1.1
Windows10 Home (64bit)

Steps taken and the problem encountered

Using the "Create New Branch" option in the bottom-right menu of the Commit Dock, I created a branch named publish.

The selected branch in the bottom-left of the Commit Dock automatically switched from master to publish.

I committed several files to the publish branch.

Using the "Remove Branch" option in the bottom-right menu of the Commit Dock, I deleted the currently selected publish branch.

Godot4 Git plugin remove branch probrem #1

Immediately afterward, two error dialogs were displayed, and some of the files I had just committed disappeared.
The first dialog displayed the message: "Cannot open file 'filename.tscn'. The file may have been moved or deleted."
The second dialog displayed the message: "Cannot load due to a missing dependency: filename.gd."

When I closed the dialogs, the editor forcibly closed itself.

Even after restarting the editor, the files remained missing, and errors related to the missing files were displayed.

The deleted files were not found in the recycle bin either.

Godot4 Git plugin remove branch probrem #2

Workaround

If you select a different branch (e.g., master) and then delete the publish branch, the branch is removed successfully without errors.

Request

Please prevent the deletion of the currently selected branch.
For example, by excluding the currently selected branch from the "Remove Branch" list or by displaying a dialog to interrupt the process.

The Issue is Not File Deletion, but the Ability to Delete the Currently Selected Branch

(Added on 2025/04/23)

When switching branches, it was confirmed that TortoiseGit also deletes files or folders that were tracked in the previous branch (e.g., publish) but not in the branch after switching (e.g., master).
However, these deleted files or folders can be restored by switching back to the original branch (e.g., publish).

master branch  
 a.txt  

publish branch  
 a.txt  
 b.txt  

File states during branch switching  

publish -> master   -> publish  
a.txt    -> a.txt       -> a.txt  
b.txt    -> (deleted) -> b.txt  

The main point of this issue is not that files or folders were deleted when the selected branch (e.g., publish) was removed and the remaining branch (e.g., master) was automatically switched to.
Instead, the point is that after the original branch (e.g., publish) was deleted, the files or folders cannot be restored.

File states when the selected branch is deleted, and it is automatically switched to the `master` branch  

publish -> master   -> publish (deleted)  
a.txt    -> a.txt       -> Cannot switch back.  
b.txt    -> (deleted) -> Cannot switch back.  

Therefore, it would be safer if the list displayed in the "Remove branch" option prevents selecting the currently active branch (e.g., publish).

That is all for my report.

This text was translated from Japanese to English using Windows 10 Copilot.
It was then retranslated back into Japanese with Google Translate to verify its accuracy before posting.

Lingua principale
C++
Stelle
966
Fork
100
Metriche di merge delle PR
Nessuna PR unita negli ultimi 30g

Preparare l'ambiente

Questo progetto non fornisce container di sviluppo, Dockerfile né guida per i contributori, quindi l'ambiente è a tuo carico: parti dal suo README e consulta la nostra guida al primo contributo per i passaggi generali.

Come iniziare

  1. Leggi tutta la issue e poi la guida ai contributi del progetto.
  2. Commenta sulla issue per dire che te ne occupi tu — evita che due persone facciano lo stesso lavoro.
  3. Fai un fork del repository e lavora su un branch.
  4. Apri una pull request che faccia riferimento al numero della issue.

Altre issue di godotengine/godot-git-plugin

Tutte le issue di godotengine/godot-git-plugin

Issue simili

Altre issue su C++

Ricevi le nuove issue nella tua casella

Un breve riepilogo di issue GitHub adatte ai principianti.