mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-12 08:36:25 -04:00
2a69d4c140
The focused main view is the staging surface, so it has to resolve the diff it shows to patch-space. A pager that restructures the diff without emitting our metadata (stock delta-default, plain difftastic, `cat -n`) produces output the buffer parser can't read, which would leave its diff unstageable. When such a diff is focused, re-render it raw — git's own colour, no pager — the same content a no-pager setup shows, which the buffer parser handles. Browsing keeps the pretty pager output; only focusing to act switches to raw. Whether the pager is usable is decided by probing it: run it on empty input and look for the version-only OSC 1717 handshake a metadata-aware pager emits first. This is a pager-level, content-independent fact (a binary file, which has no change lines under any pager, can't mislead it) and it's known before we render, so we never render pretty only to discover mid-flight that we should have rendered raw. The verdict is cached per pager (reset when the pager changes). No PTY is needed — git needs a terminal to decide to invoke a pager, but the pager emits the handshake regardless. A git-config external diff driver (useExternalDiffGitConfig) is chosen per file via .gitattributes and a single diff can mix drivers, so there's no one pager to probe; it's treated as unsupported (always raw). Bypassing the pager needs two things, since a pager reaches the diff by two routes: an external diff command (suppressed in the cmd via the new ignoreExternalDiff arg, keeping git's colour, unlike plain) and a stdin pager (GIT_PAGER, applied by the pty task — so the raw render uses a plain command task instead). This wires the files panel; the commit/stash/patch-building panels follow. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| bisect | ||
| branch | ||
| cherry_pick | ||
| commit | ||
| config | ||
| conflicts | ||
| custom_commands | ||
| demo | ||
| diff | ||
| file | ||
| filter_and_search | ||
| filter_by_author | ||
| filter_by_path | ||
| interactive_rebase | ||
| misc | ||
| patch_building | ||
| reflog | ||
| remote | ||
| shared | ||
| shell_commands | ||
| staging | ||
| stash | ||
| status | ||
| submodule | ||
| sync | ||
| tag | ||
| ui | ||
| undo | ||
| worktree | ||
| test_list.go | ||
| test_list_generator.go | ||
| tests.go | ||