Repository navigation
Commit 5324f6a
committed
fix(git): disable external diff for review diff previews
With diff.external configured, git diff delegates to that tool instead of
emitting a unified patch, so the Diff panel cannot parse it and falls back to
"Unsupported diff format. Showing raw patch." That is #927.
#927 was closed by #2553, which added --no-ext-diff to prepareCommitContext
and readRangeContext, and #2586 had already added it to the checkpoint diff.
Neither covered getReviewDiffPreview, which backs the Working tree and Branch
scopes, so those two still route through the external tool.
Adds --no-color --no-ext-diff --no-textconv to the three remaining call sites:
the tracked working-tree diff, the base...HEAD branch diff, and the --no-index
untracked file diffs.1 parent d19039a commit 5324f6a
1 file changed
Lines changed: 18 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2001 | 2001 | | |
2002 | 2002 | | |
2003 | 2003 | | |
2004 | | - | |
| 2004 | + | |
| 2005 | + | |
| 2006 | + | |
| 2007 | + | |
| 2008 | + | |
| 2009 | + | |
| 2010 | + | |
| 2011 | + | |
| 2012 | + | |
| 2013 | + | |
| 2014 | + | |
| 2015 | + | |
2005 | 2016 | | |
2006 | 2017 | | |
2007 | 2018 | | |
| |||
2046 | 2057 | | |
2047 | 2058 | | |
2048 | 2059 | | |
| 2060 | + | |
| 2061 | + | |
| 2062 | + | |
2049 | 2063 | | |
2050 | 2064 | | |
2051 | 2065 | | |
| |||
2079 | 2093 | | |
2080 | 2094 | | |
2081 | 2095 | | |
| 2096 | + | |
| 2097 | + | |
| 2098 | + | |
2082 | 2099 | | |
2083 | 2100 | | |
2084 | 2101 | | |
| |||
0 commit comments