libsoup3: update to 3.6.0; fix GTK2/3 app startup
[oi-userland.git] / components / developer / git / patches / 0008-test-here-tab.patch
blobd154db6cdbeb7111d7f9589cf8847b1a8d435ca8
1 We need to run the t3404 test without this patch on Linux to see how it behaves
2 there. If it pass there then we need to find why. If it fails there then we
3 need to submit this (or similar) fix upstream.
5 --- git-2.45.1/t/t3404-rebase-interactive.sh.orig
6 +++ git-2.45.1/t/t3404-rebase-interactive.sh
7 @@ -1916,13 +1916,14 @@
8 test_cmp_rev HEAD~1 refs/heads/third &&
9 test_cmp_rev HEAD refs/heads/no-conflict-branch &&
11 - cat >expect <<-\EOF &&
12 + tab=$'\''\t'\'' &&
13 + cat >expect <<-EOF &&
14 Successfully rebased and updated refs/heads/update-refs.
15 Updated the following refs with --update-refs:
16 - refs/heads/first
17 - refs/heads/no-conflict-branch
18 - refs/heads/second
19 - refs/heads/third
20 + ${tab}refs/heads/first
21 + ${tab}refs/heads/no-conflict-branch
22 + ${tab}refs/heads/second
23 + ${tab}refs/heads/third
24 EOF
26 # Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
27 @@ -2177,13 +2178,14 @@
28 test_must_fail git rebase --continue 2>err &&
29 grep "update_ref failed for ref '\''refs/heads/second'\''" err &&
31 - cat >expect <<-\EOF &&
32 + tab=$'\''\t'\'' &&
33 + cat >expect <<-EOF &&
34 Updated the following refs with --update-refs:
35 - refs/heads/first
36 - refs/heads/no-conflict-branch
37 - refs/heads/third
38 + ${tab}refs/heads/first
39 + ${tab}refs/heads/no-conflict-branch
40 + ${tab}refs/heads/third
41 Failed to update the following refs with --update-refs:
42 - refs/heads/second
43 + ${tab}refs/heads/second
44 EOF
46 # Clear "Rebasing (X/Y)" progress lines and drop leading tabs.