Indefero Commit Details

Date:

2010-10-07 06:56:52 (14 years 2 months ago)

Author:

Thomas Keller

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

806e69b85898d3e36e5f307d1cfb5c8205562d84

Parents:

a29a2a0fa424d116dd50c9a658409ac4cdf2ee62

Message:

Don't let sync git fail on ssh keys with no comment field (references: issue 531 and issue 545)

Changes:

File differences

-80
81 81
82 82
83 
83
84 84
85 85
86 86
+        if (preg_match('#^\[pubkey ([^\]]+)\]\s*(\S+)\s*\[end\]$#', $this->content, $m)) {␊
            return array('mtn', $m[1], $m[2]);␊
        }␊
        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)\s(\S+)$#', $this->content, $m)) {␊
        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S+))?$#', $this->content, $m)) {␊
            return array('ssh', $m[2], $m[1]);␊
        }␊
␊
         if (preg_match('#^\[pubkey ([^\]]+)\]\s*(\S+)\s*\[end\]$#', $this->content, $m)) {␊
             return array('mtn', $m[1], $m[2]);␊
         }␊
-        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)\s(\S+)$#', $this->content, $m)) {␊
+        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S+))?$#', $this->content, $m)) {␊
             return array('ssh', $m[2], $m[1]);␊
         }␊
 ␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags