1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-01 13:17:53 +02:00

generate snapshot for expected dir in separate tmp dir

This commit is contained in:
Jesse Duffield 2022-01-28 23:46:32 +11:00
parent 1d90e1b565
commit e0ae134ee4

View File

@ -414,17 +414,26 @@ func generateSnapshots(actualDir string, expectedDir string) (string, string, er
return "", "", err return "", "", err
} }
defer func() { // there are a couple of reasons we're not generating the snapshot in expectedDir directly:
if err := renameGitDirs(expectedDir); err != nil { // Firstly we don't want to have to revert our .git file back to .git_keep.
panic(err) // Secondly, the act of calling git commands like 'git status' actually changes the index
} // for some reason, and we don't want to leave your lazygit working tree dirty as a result.
}() expectedDirCopyDir := filepath.Join(filepath.Dir(expectedDir), "expected_dir_test")
err = oscommands.CopyDir(expectedDir, expectedDirCopyDir)
if err := restoreGitDirs(expectedDir); err != nil { if err != nil {
return "", "", err return "", "", err
} }
expected, err := generateSnapshot(expectedDir) if err := restoreGitDirs(expectedDirCopyDir); err != nil {
return "", "", err
}
expected, err := generateSnapshot(expectedDirCopyDir)
if err != nil {
return "", "", err
}
err = os.RemoveAll(expectedDirCopyDir)
if err != nil { if err != nil {
return "", "", err return "", "", err
} }