Skip to content

Commit e1b4767

Browse files
committed
release.pl: build from 'HEAD' instead of 'devel'
This should simplify work for contributors as they are expected to work on branches, not directly on 'devel'.
1 parent 5b957c9 commit e1b4767

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

release.pl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,13 @@ ($;@)
171171
@ARGV,
172172
);
173173

174-
my ($devel_commit) = git 'rev-parse' => 'devel';
175-
say "devel: $devel_commit";
174+
my ($HEAD_commit) = git 'rev-parse' => 'HEAD';
175+
say "HEAD: $HEAD_commit";
176176

177-
my %devel_tree;
178-
git 'ls-tree' => $devel_commit, sub {
177+
my %HEAD_tree;
178+
git 'ls-tree' => $HEAD_commit, sub {
179179
my ($mode, $type, $object, $file) = split;
180-
$devel_tree{$file} = [ $mode, $type, $object ];
180+
$HEAD_tree{$file} = [ $mode, $type, $object ];
181181
};
182182

183183
my %updated_files;
@@ -189,10 +189,10 @@ ($;@)
189189
# Merge files updated in devel
190190
if ( $type eq 'blob' # Don't touch trees
191191
&& $file ne '.gitignore' # One .gitignore for each branch
192-
&& exists $devel_tree{$file}
193-
&& $object ne $devel_tree{$file}[2]) {
192+
&& exists $HEAD_tree{$file}
193+
&& $object ne $HEAD_tree{$file}[2]) {
194194
say "- $file: $object (updated)";
195-
$release_tree{$file} = $devel_tree{$file};
195+
$release_tree{$file} = $HEAD_tree{$file};
196196
$updated_files{$file} = 1;
197197
} else {
198198
say "- $file: $object";
@@ -234,7 +234,7 @@ ($;@)
234234
my $new_release_commit =
235235
git 'commit-tree', $new_release_tree,
236236
-p => $release_commit,
237-
-p => $devel_commit,
237+
-p => $HEAD_commit,
238238
# For maximum compat, don't use '-m' but STDIN
239239
\($version
240240
? "Release v$version"

0 commit comments

Comments
 (0)