mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-23 12:18:51 +02:00
1fdcc29277
It is a bad idea to read a git-rebase-todo file, remove some update-ref todos, and write it back out behind git's back. This will cause git to actually remove the branches referenced by those update-ref todos when the rebase is continued. The reason is that git remembers the refs affected by update-ref todos at the beginning of the rebase, and remembers information about them in the file .git/rebase-merge/update-refs. Then, whenever the user performs a "git rebase --edit-todo" command, it updates that file based on whether update-ref todos were added or removed by that edit. If we rewrite the git-rebase-todo file behind git's back, this updating doesn't happen. Fix this by not updating the git-rebase-todo file directly in this case, but performing a "git rebase --edit-todo" command where we set ourselves as the editor and change the file in there. This makes git update the bookkeeping information properly. Ideally we would use this method for all cases where we change the git-rebase-todo file (e.g. moving todos up/down, or changing the type of a todo); this would be cleaner because we wouldn't mess with git's private implementation details. I tried this, but unfortunately it isn't fast enough. Right now, moving a todo up or down takes between 1 and 2ms on my machine; changing it to do a "git rebase --edit-todo" slows it down to over 100ms, which is unacceptable.
73 lines
2.2 KiB
Go
73 lines
2.2 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Delete an update-ref item from the rebase todo list",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
GitVersion: AtLeast("2.38.0"),
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
NewBranch("branch1").
|
|
CreateNCommits(3).
|
|
NewBranch("branch2").
|
|
CreateNCommitsStartingAt(3, 4)
|
|
|
|
shell.SetConfig("rebase.updateRefs", "true")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
NavigateToLine(Contains("commit 01")).
|
|
Press(keys.Universal.Edit).
|
|
Lines(
|
|
Contains("pick").Contains("CI commit 06"),
|
|
Contains("pick").Contains("CI commit 05"),
|
|
Contains("pick").Contains("CI commit 04"),
|
|
Contains("update-ref").Contains("branch1"),
|
|
Contains("pick").Contains("CI commit 03"),
|
|
Contains("pick").Contains("CI commit 02"),
|
|
Contains("CI ◯ <-- YOU ARE HERE --- commit 01"),
|
|
).
|
|
NavigateToLine(Contains("update-ref")).
|
|
Press(keys.Universal.Remove).
|
|
Tap(func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Drop commit")).
|
|
Content(Contains("Are you sure you want to delete the selected update-ref todo(s)?")).
|
|
Confirm()
|
|
}).
|
|
Lines(
|
|
Contains("pick").Contains("CI commit 06"),
|
|
Contains("pick").Contains("CI commit 05"),
|
|
Contains("pick").Contains("CI commit 04"),
|
|
Contains("pick").Contains("CI commit 03").IsSelected(),
|
|
Contains("pick").Contains("CI commit 02"),
|
|
Contains("CI ◯ <-- YOU ARE HERE --- commit 01"),
|
|
).
|
|
NavigateToLine(Contains("commit 02")).
|
|
Press(keys.Universal.Remove).
|
|
Tap(func() {
|
|
t.Common().ContinueRebase()
|
|
}).
|
|
Lines(
|
|
Contains("CI ◯ commit 06"),
|
|
Contains("CI ◯ commit 05"),
|
|
Contains("CI ◯ commit 04"),
|
|
Contains("CI ◯ commit 03"), // No star on this commit, so there's no branch head here
|
|
Contains("CI ◯ commit 01"),
|
|
)
|
|
|
|
t.Views().Branches().
|
|
Lines(
|
|
Contains("branch2"),
|
|
Contains("branch1"),
|
|
)
|
|
},
|
|
})
|