1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
use strict;
use warnings;
use Dist::Zilla 1.093250;
use Dist::Zilla::Tester;
use Path::Tiny qw(path);
use Test::More tests => 8;
use Try::Tiny qw(try);
use lib 't/lib';
use Util qw( chdir_original_cwd clean_environment init_repo );
# Mock HOME to avoid ~/.gitexcludes from causing problems
# and clear GIT_ environment variables
my $homedir = clean_environment;
my $corpus_dir = path('corpus/commit-build-src-as-parent')->absolute;
my $zilla = Dist::Zilla::Tester->from_config({ dist_root => $corpus_dir, });
# build fake repository
chdir path( $zilla->tempdir )->child('source');
my $git = init_repo( qw{ . dist.ini Changes } );
$zilla->build;
ok( $git->rev_parse('-q', '--verify', 'refs/heads/build/master'), 'source repo has the "build/master" branch')
or diag $git->branch;
is( scalar $git->log('build/master'), 2, 'two commit on the build/master branch')
or diag $git->branch;
is( scalar $git->ls_tree('build/master'), 2, 'two files in latest commit on the build/master branch')
or diag $git->branch;
my @log = $git->log('build/master');
like try {$log[1]->message} => qr/initial commit/, 'master is a parent';
like try {$log[0]->message} => qr/Build results of \w+ \(on master\)/, 'build commit';
chdir_original_cwd;
my $zilla2 = Dist::Zilla::Tester->from_config({
dist_root => path('corpus/commit-build')->absolute,
});
# build fake repository
chdir path( $zilla2->tempdir )->child('source');
my $git2 = init_repo('.');
$git2->remote('add','origin', path( $zilla->tempdir )->child('source')->stringify);
$git2->fetch;
$git2->reset('--hard','origin/master');
$git2->checkout('-b', 'topic/1');
append_to_file('dist.ini', "\n");
$git2->commit('-a', '-m', 'commit on topic branch');
$zilla2->build;
ok( $git2->rev_parse('-q', '--verify', 'refs/heads/build/topic/1'), 'source repo has the "build/topic/1" branch') or diag $git2->branch;
chdir_original_cwd;
my $zilla3 = Dist::Zilla::Tester->from_config({
dist_root => path('corpus/commit-build')->absolute,
});
# build fake repository
chdir path($zilla3->tempdir)->child('source');
my $git3 = init_repo('.');
$git3->remote('add','origin', path( $zilla->tempdir )->child('source')->stringify);
$git3->fetch;
$git3->branch('build/master', 'origin/build/master');
$git3->reset('--hard','origin/master');
append_to_file('dist.ini', "\n\n");
$git3->commit('-a', '-m', 'commit on master');
$zilla3->build;
is( scalar $git3->log('build/master'), 3, 'three commits on the build/master branch')
or diag $git3->branch;
is( scalar $git->ls_tree('build/master'), 2, 'two files in latest commit on the build/master branch')
or diag $git->branch;
chdir_original_cwd;
sub append_to_file {
my ($file, @lines) = @_;
my $fh = path($file)->opena(@lines);
print $fh @_;
close $fh;
}
|
