Skip to content

Commit

Permalink
Remove :(glob) when used as branch name.
Browse files Browse the repository at this point in the history
  • Loading branch information
gtback committed Jul 20, 2020
1 parent 65289d6 commit a80a0d4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/ES/Repo.pm
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,14 @@ sub _prepare_sub_dir {
my $merge_branch = "${resolved_branch}_${subbed_head}_$path";
$merge_branch =~ s|/|_|g;
$merge_branch =~ s|\*|splat|g;
$merge_branch =~ s|:\(glob\)|_glob_|g;
$merge_branch =~ s|\.$||g; # Fix funny shaped paths

# Check if we've already merged this path by looking for the merged_branch
# in the source repo. This is safe because:
# 1. We prune all branches from the source repo before the build.
# 2. The merge branch contains the hash of the subbed head.
my $already_built = eval {
my $already_built = eval {
local $ENV{GIT_DIR} = $self->{git_dir};
run qw(git rev-parse), $merge_branch;
1;
Expand Down

0 comments on commit a80a0d4

Please sign in to comment.