sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-10-16 09:27:37 +03:00
Code Activity

Fix showing diffs for renamed file when filtering by path

Browse Source 
When filtering for a file path we use the --follow option for "git log", so it
will follow renames of the file, which is great. However, if you then selected
one of the commits before a rename, you didn't see a diff, because we would pass
the original filter path to the "git show" call.

To fix this, call git log with the --name-status option when filtering by path,
so that each commit reports which file paths are touched in this commit;
remember these in the commit object, so that we can pass them to the "git show"
call later.

Be careful not to store too many such paths unnecessarily. When filtering by
folder rather than file, all these paths will necessarily be inside the original
filter path, so detect this and don't store them in this case.

There is some unfortunate code duplication between loading commits and loading
reflog commits, which I am too lazy to clean up right now.
This commit is contained in:
Stefan Haller
2025-05-30 10:08:13 +02:00
parent 88dae1d8b9
commit 0f7f1a56df
11 changed files with 120 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/commands/git_commands/commit_test.go
View File

@@ -251,7 +251,7 @@ func TestCommitCreateAmendCommit(t *testing.T) {
func TestCommitShowCmdObj(t *testing.T) {
type scenario struct {
testName string
filterPath string
filterPaths []string
contextSize uint64
similarityThreshold int
ignoreWhitespace bool
@@ -262,7 +262,7 @@ func TestCommitShowCmdObj(t *testing.T) {
scenarios := []scenario{
{
testName: "Default case without filter path",
filterPath: "",
filterPaths: []string{},
contextSize: 3,
similarityThreshold: 50,
ignoreWhitespace: false,
@@ -271,7 +271,7 @@ func TestCommitShowCmdObj(t *testing.T) {
},
{
testName: "Default case with filter path",
filterPath: "file.txt",
filterPaths: []string{"file.txt"},
contextSize: 3,
similarityThreshold: 50,
ignoreWhitespace: false,
@@ -280,7 +280,7 @@ func TestCommitShowCmdObj(t *testing.T) {
},
{
testName: "Show diff with custom context size",
filterPath: "",
filterPaths: []string{},
contextSize: 77,
similarityThreshold: 50,
ignoreWhitespace: false,
@@ -289,7 +289,7 @@ func TestCommitShowCmdObj(t *testing.T) {
},
{
testName: "Show diff with custom similarity threshold",
filterPath: "",
filterPaths: []string{},
contextSize: 3,
similarityThreshold: 33,
ignoreWhitespace: false,
@@ -298,7 +298,7 @@ func TestCommitShowCmdObj(t *testing.T) {
},
{
testName: "Show diff, ignoring whitespace",
filterPath: "",
filterPaths: []string{},
contextSize: 77,
similarityThreshold: 50,
ignoreWhitespace: true,
@@ -307,7 +307,7 @@ func TestCommitShowCmdObj(t *testing.T) {
},
{
testName: "Show diff with external diff command",
filterPath: "",
filterPaths: []string{},
contextSize: 3,
similarityThreshold: 50,
ignoreWhitespace: false,
@@ -330,7 +330,7 @@ func TestCommitShowCmdObj(t *testing.T) {
}
instance := buildCommitCommands(commonDeps{userConfig: userConfig, appState: &config.AppState{}, runner: runner, repoPaths: &repoPaths})
assert.NoError(t, instance.ShowCmdObj("1234567890", s.filterPath).Run())
assert.NoError(t, instance.ShowCmdObj("1234567890", s.filterPaths).Run())
runner.CheckForMissingCalls()
})
}