diff options
| author |   Sitaram Chamarty <sitaramc@gmail.com> | 2021-08-27 21:26:08 +0530 |
|---|---|---|
| committer | Sitaram Chamarty <sitaramc@gmail.com> | 2022-06-02 11:22:27 +0530 |
| commit | 2bc5e67042ac3fbf4003a4336b42f7405b778f27 (patch) | |
| tree | 0fc84feea5b9853712c54282d11ca0dc3df09e32 | |
| parent | Update ukm for modern perl (diff) | |
| download | gitolite-gentoo-2bc5e67042ac3fbf4003a4336b42f7405b778f27.tar.gz gitolite-gentoo-2bc5e67042ac3fbf4003a4336b42f7405b778f27.tar.bz2 gitolite-gentoo-2bc5e67042ac3fbf4003a4336b42f7405b778f27.zip | |
minor testing fixup
| -rwxr-xr-x | t/merge-check.t | 2 | ||||
| -rwxr-xr-x | t/partial-copy.t | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/t/merge-check.t b/t/merge-check.t index fdea318..4a50db0 100755 --- a/t/merge-check.t +++ b/t/merge-check.t @@ -43,7 +43,7 @@ try " test-commit bb cc; ok checkout master; ok; /Switched to branch 'master'/ test-commit dd ee; ok - git merge new; ok; /Merge made.*recursive/ + git merge new; ok; /Merge made/ test-commit ff; ok tag end; ok "; diff --git a/t/partial-copy.t b/t/partial-copy.t index 493f0d4..75dfd12 100755 --- a/t/partial-copy.t +++ b/t/partial-copy.t @@ -90,20 +90,20 @@ try " tc u4n1 u4n2 PUSH u4 next; ok /To .*/foo.git/ - /new branch\\] ca3787119b7e8b9914bc22c939cefc443bc308da -> refs/partial/br-\\d+/ + /new reference\\] ca3787119b7e8b9914bc22c939cefc443bc308da -> refs/partial/br-\\d+/ /file:///foo-pc/ /52c7716..ca37871 next -> next/ tag u4/nexttag; glt push u4 --tags /To file:///foo-pc/ /\\[new tag\\] u4/nexttag +-> +u4/nexttag/ - /\\[new branch\\] ca3787119b7e8b9914bc22c939cefc443bc308da -> refs/partial/br-\\d+/ + /\\[new reference\\] ca3787119b7e8b9914bc22c939cefc443bc308da -> refs/partial/br-\\d+/ checkout master checkout -b dev/u4/u4master tc devu4m1 devu4m2 PUSH u4 HEAD; ok /To .*/foo.git/ - /new branch\\] 228353950557ed1eb13679c1fce4d2b4718a2060 -> refs/partial/br-\\d+/ + /new reference\\] 228353950557ed1eb13679c1fce4d2b4718a2060 -> refs/partial/br-\\d+/ /file:///foo-pc/ /new branch.* HEAD -> dev/u4/u4master/ |