On Wed, 17 Aug 2016 23:36:51 +0200, gregor herrmann wrote: > > #v+ > > Test Summary Report > > ------------------- > > t/50-client.t (Wstat: 256 Tests: 31 Failed: 1) > > Failed test: 31 > > Non-zero exit status: 1 > > t/52-client-git.t (Wstat: 65024 Tests: 68 Failed: 0) > > Non-zero exit status: 254 > > Parse errors: No plan found in TAP output > > t/54-client-git-squash.t (Wstat: 256 Tests: 13 Failed: 1) > > Failed test: 13 > > Non-zero exit status: 1 > > t/55-client-git-merges-ff.t (Wstat: 256 Tests: 14 Failed: 1) > > Failed test: 14 > > Non-zero exit status: 1 > > t/56-client-git-ff-merge-2.t (Wstat: 256 Tests: 15 Failed: 1) > > Failed test: 15 > > Non-zero exit status: 1 > > t/57-client-git-squash-tags.t (Wstat: 256 Tests: 9 Failed: 1) > > Failed test: 9 > > Non-zero exit status: 1 > > Files=16, Tests=263, 17 wallclock secs ( 0.10 usr 0.01 sys + 13.37 cusr > > 1.71 csys = 15.19 CPU) > > Result: FAIL > > Failed 6/16 test programs. 5/263 subtests failed. > > #v- > > Ok, this is caused by ade2ca5.
Fixed by Tincho; thanks! > This looks interesting: /usr/share/doc/git/RelNotes/2.9.0.txt > Merging two branches that have no common ancestor with "git merge" is > by default forbidden now to prevent creating such an unusual merge by > mistake. > A quick hotfix would be: > > #v+ > --- a/t/52-client-git.t > +++ b/t/52-client-git.t > @@ -376,7 +376,13 @@ is( $commit, undef ); > > # now the same on the master branch > $git->command( [ 'checkout', '-q', 'master' ], { STDERR => 0 } ); > -$git->command( 'merge', 'allnew' ); > +my $gitversion = Git::command_oneline('version'); > +$gitversion =~ s/^git version\s*//; > +if ( $gitversion ge '2.9.0' ) { > + $git->command( 'merge', 'allnew', '--allow-unrelated-histories' ); > +} else { > + $git->command( 'merge', 'allnew' ); > +} > push_ok(); > $c2 = $commit = $c->describe_commit; > ok( defined($commit), 'empty branch merge commit exists' ); > #v- > > > With this change the test passes in sid and stretch (ignoring the > fact that this version extraction and comparison attempt is ugly at > best). Do we need this test? Committed with a slight change. Hm, I guess we should think about a release? Cheers, gregor -- .''`. Homepage https://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: The Cranberries: Disappointment
signature.asc
Description: Digital Signature