mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-08-06 22:33:07 +02:00
Fix showing range diff across a rename when filtering by path
We need to pass the union of filter paths at both ends of the range.
This commit is contained in:
@ -113,7 +113,6 @@ var ShowDiffsForRenamedFile = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Press(keys.Universal.RangeSelectUp)
|
||||
|
||||
t.Views().Main().ContainsLines(
|
||||
/* EXPECTED:
|
||||
Contains("Showing diff for range"),
|
||||
Equals(""),
|
||||
Equals(" oldFile => newFile | 2 +-"),
|
||||
@ -131,19 +130,6 @@ var ShowDiffsForRenamedFile = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Equals("+y"),
|
||||
Equals(" b"),
|
||||
Equals(" c"),
|
||||
ACTUAL: */
|
||||
Equals(" newFile | 3 +++"),
|
||||
Equals(" 1 file changed, 3 insertions(+)"),
|
||||
Equals(""),
|
||||
Equals("diff --git a/newFile b/newFile"),
|
||||
Equals("new file mode 100644"),
|
||||
Contains("index"),
|
||||
Equals("--- /dev/null"),
|
||||
Equals("+++ b/newFile"),
|
||||
Equals("@@ -0,0 +1,3 @@"),
|
||||
Equals("+y"),
|
||||
Equals("+b"),
|
||||
Equals("+c"),
|
||||
)
|
||||
},
|
||||
})
|
||||
|
Reference in New Issue
Block a user