undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-send-email-alias-loop'

Browse Source 
* jk/maint-send-email-alias-loop:
  send-email: detect cycles in alias expansion
This commit is contained in:
Junio C Hamano 2009-07-25 00:44:45 -07:00
commit e34bbd3b3c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-send-email.perl
View File

@ -654,13 +654,17 @@ if (!@to) {
} }
sub expand_aliases { sub expand_aliases {
my @cur = @_; return map { expand_one_alias($_) } @_;
my @last; }
do {
@last = @cur; my %EXPANDED_ALIASES;
@cur = map { $aliases{$_} ? @{$aliases{$_}} : $_ } @last; sub expand_one_alias {
} while (join(',',@cur) ne join(',',@last)); my $alias = shift;
return @cur; if ($EXPANDED_ALIASES{$alias}) {
die "fatal: alias '$alias' expands to itself\n";
}
local $EXPANDED_ALIASES{$alias} = 1;
return $aliases{$alias} ? expand_aliases(@{$aliases{$alias}}) : $alias;
} }
@to = expand_aliases(@to); @to = expand_aliases(@to);