Repository navigation
Commit 4e531e5
committed
Fix getRemoteBranches behavior with newer versions of git
At some point, the git CLI did not return "$remoteName/HEAD" when
executing "git branch -r" and now it does for some reason. This breaks
some tests, so let's filter it out in both clients and add tests to
ensure the filtering works.
Also, fix a couple of getRemoteBranches tests that were passing by
coincidence due to not specifying the correct remote name and therefore
getting empty lists.
commit-id: I1011dd0b1 parent 52aa2f9 commit 4e531e5
3 files changed
Lines changed: 65 additions & 6 deletions
File tree
- git-jaspr/src
- main/kotlin/sims/michael/gitjaspr
- test/kotlin/sims/michael/gitjaspr
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
133 | 134 | | |
134 | 135 | | |
135 | 136 | | |
136 | | - | |
| 137 | + | |
137 | 138 | | |
138 | 139 | | |
139 | 140 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
168 | 168 | | |
169 | 169 | | |
170 | 170 | | |
| 171 | + | |
171 | 172 | | |
172 | 173 | | |
173 | 174 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| |||
367 | 368 | | |
368 | 369 | | |
369 | 370 | | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
370 | 416 | | |
371 | 417 | | |
372 | 418 | | |
| |||
389 | 435 | | |
390 | 436 | | |
391 | 437 | | |
392 | | - | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
393 | 442 | | |
394 | 443 | | |
395 | 444 | | |
396 | 445 | | |
397 | 446 | | |
398 | 447 | | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
399 | 452 | | |
400 | | - | |
401 | | - | |
| 453 | + | |
| 454 | + | |
402 | 455 | | |
403 | 456 | | |
404 | 457 | | |
| |||
444 | 497 | | |
445 | 498 | | |
446 | 499 | | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
447 | 504 | | |
448 | | - | |
449 | | - | |
| 505 | + | |
| 506 | + | |
450 | 507 | | |
451 | 508 | | |
452 | 509 | | |
| |||
0 commit comments