Commit bb0a3a2
committed
fix(init): resolve broken merge in bash/zsh fzf blocks
The merge of main into fix-open-ai inserted new --expect code above the
existing porcelain/empty-state logic instead of replacing it, leaving a
dangling _gtr_selection subshell and duplicate variable declarations that
produced syntax errors in the generated shell code.
Move the _gtr_key/_gtr_line declarations to after the empty-state guard
and remove the orphaned half-finished assignment lines so bash -n passes
cleanly on the generated init output.1 parent 748115b commit bb0a3a2
1 file changed
Lines changed: 2 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
86 | | - | |
87 | | - | |
88 | 86 | | |
89 | 87 | | |
90 | 88 | | |
91 | 89 | | |
92 | 90 | | |
93 | 91 | | |
94 | | - | |
| 92 | + | |
95 | 93 | | |
96 | 94 | | |
97 | 95 | | |
| |||
201 | 199 | | |
202 | 200 | | |
203 | 201 | | |
204 | | - | |
205 | | - | |
206 | 202 | | |
207 | 203 | | |
208 | 204 | | |
209 | 205 | | |
210 | 206 | | |
211 | 207 | | |
212 | | - | |
| 208 | + | |
213 | 209 | | |
214 | 210 | | |
215 | 211 | | |
| |||
0 commit comments