support drilling down into the files of a diff

1 files changed, 18 insertions, 1 deletions

diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go
index 6e3cd4b1f..c5f898b4e 100644
--- a/pkg/gui/commit_files_panel.go
+++ b/pkg/gui/commit_files_panel.go
@@ -94,7 +94,24 @@ func (gui *Gui) refreshCommitFilesView() error {
 	}
 
 	isStash := gui.State.Panels.CommitFiles.refType == REF_TYPE_STASH
-	files, err := gui.GitCommand.GetFilesInRef(gui.State.Panels.CommitFiles.refName, isStash, gui.GitCommand.PatchManager)
+	refName := gui.State.Panels.CommitFiles.refName
+	diffing := gui.State.Modes.Diffing
+
+	var files []*commands.CommitFile
+	var err error
+	if diffing.Active() {
+		from := diffing.Ref
+		to := refName
+
+		if diffing.Reverse {
+			from, to = to, from
+		}
+
+		files, err = gui.GitCommand.GetFilesInDiff(from, to, refName, gui.GitCommand.PatchManager)
+	} else {
+		files, err = gui.GitCommand.GetFilesInRef(refName, isStash, gui.GitCommand.PatchManager)
+	}
+
 	if err != nil {
 		return gui.surfaceError(err)
 	}