diff options
| author | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
| commit | 86edd73d169600875a10a635ef8df4a644545b0d (patch) | |
| tree | 1216eb826f2da7a1c11d84395f25468d1acfa69c /gitremotes | |
| parent | 17b3d73f6e65d6a754633902b0dd4716d53b03a9 (diff) | |
| parent | e40d2a6b2b1bdf677f11cc4a71595acf609d1e75 (diff) | |
| download | ikiwiki-86edd73d169600875a10a635ef8df4a644545b0d.tar ikiwiki-86edd73d169600875a10a635ef8df4a644545b0d.tar.gz | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'gitremotes')
| -rwxr-xr-x | gitremotes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitremotes b/gitremotes index 7b9484dd1..91bf2fe84 100755 --- a/gitremotes +++ b/gitremotes @@ -6,7 +6,7 @@ my $error=0; open (IN, "doc/git.mdwn") || die "doc/git.mdwn: $!"; while (<IN>) { - if (/^\*\s+\[?\[?(\w+)\]?\]?\s+`([^>]+)`/) { + if (/^\*\s+\[?\[?(\w+)(?:\|\w+)?\]?\]?\s+`([^>]+)`/) { # note that the remote name has to be a simple word (\w) # for security/sanity reasons my $remote=$1; |