From a2778f01c661468caaf2aa2c3476f58e9925dbc4 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Thu, 18 May 2023 16:05:08 +0200 Subject: [PATCH] Disregard the "ignore whitespace" option in the patch building panel It's not possible to reliably stage things into a custom patch when "ignore whitespace" is on, so always treat it as off here (like we do in the staging panel). It looks like this is a regression that was introduced in 8edad826ca. --- pkg/gui/controllers/helpers/patch_building_helper.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/gui/controllers/helpers/patch_building_helper.go b/pkg/gui/controllers/helpers/patch_building_helper.go index 38f850886..7dd93e6a6 100644 --- a/pkg/gui/controllers/helpers/patch_building_helper.go +++ b/pkg/gui/controllers/helpers/patch_building_helper.go @@ -73,7 +73,9 @@ func (self *PatchBuildingHelper) RefreshPatchBuildingPanel(opts types.OnFocusOpt ref := self.c.Contexts().CommitFiles.CommitFileTreeViewModel.GetRef() to := ref.RefName() from, reverse := self.c.Modes().Diffing.GetFromAndReverseArgsForDiff(ref.ParentRefName()) - diff, err := self.c.Git().WorkingTree.ShowFileDiff(from, to, reverse, path, true, self.c.State().GetIgnoreWhitespaceInDiffView()) + // Passing false for ignoreWhitespace because the patch building panel + // doesn't work when whitespace is ignored + diff, err := self.c.Git().WorkingTree.ShowFileDiff(from, to, reverse, path, true, false) if err != nil { return err }