Commit 21f1f11
authored
fix: add --log-format=%i to daemon args for itemize interop (#3083)
Upstream options.c:2750-2762 sends --log-format=%i to the server when
the client is sender (push mode) and itemize-changes is enabled. This
tells the daemon's receiver to emit itemize output via MSG_INFO frames.
The SSH invocation path already included this arg, but the daemon
argument builder (build_full_daemon_args) was missing it, causing
oc:itemize interop test failures when pushing to an upstream daemon.
Also removes oc:itemize and oc:merge-filter from KNOWN_FAILURES.1 parent 09d3fff commit 21f1f11
3 files changed
Lines changed: 52 additions & 1 deletion
File tree
- crates/core/src/client/remote/daemon_transfer/orchestration
- tools/ci
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
161 | 168 | | |
162 | 169 | | |
163 | 170 | | |
| |||
Lines changed: 45 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
173 | 173 | | |
174 | 174 | | |
175 | 175 | | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
176 | 221 | | |
177 | 222 | | |
178 | 223 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1502 | 1502 | | |
1503 | 1503 | | |
1504 | 1504 | | |
1505 | | - | |
1506 | 1505 | | |
1507 | 1506 | | |
1508 | 1507 | | |
| |||
0 commit comments