Indefero Commit Details

Date:

2011-03-17 17:12:27 (14 years 1 month 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, release-1.1, release-1.2, release-1.3

Commit:

366d27818268936d8fe688d81f25deabb73fa289

Parents:

5f008a14f5e78513903e95073ab12c742e99c21a

Message:

Ignore "bad usage" error code in case `git tag` doesn't know of the `--contains` option.

Changes:

File differences

-248
249 249
250 250
251 
252 
251
252
253
254
253 255
254 
256
257
258
255 259
256 260
257 261
... ...
654 658
655 659
656 660
657 
661
658 662
659 663
660 664
+                     Pluf::f('git_path', 'git'),␊
                     escapeshellarg($commit));␊
        self::exec('IDF_Scm_Git::inTags', $cmd, $out, $return);␊
        if (0 != $return) {␊
            $this->cache['tags'] = array();␊
        // `git tag` gained the `--contains` option in 1.6.2, earlier␊
        // versions report a bad usage error (129) which we ignore here␊
        if (129 == $return) {␊
            $this->cache['inTags'][$commit] = array();␊
            return array();␊
            // Ugly emergency fix, needs to be cleaned.␊
        }␊
        // any other error should of course get noted␊
        if (0 != $return) {␊
            throw new IDF_Scm_Exception(sprintf($this->error_tpl,␊
                                                $cmd, $return,␊
                                                implode("\n", $out)));␊

␊
    /**␊
     * @see IDF_Scm::getDiffPathStripLevel()␊
     */ ␊
     */␊
    public function getDiffPathStripLevel()␊
    {␊
        return 1;␊
 ...
                      Pluf::f('git_path', 'git'),␊
                      escapeshellarg($commit));␊
         self::exec('IDF_Scm_Git::inTags', $cmd, $out, $return);␊
-        if (0 != $return) {␊
-            $this->cache['tags'] = array();␊
+        // `git tag` gained the `--contains` option in 1.6.2, earlier␊
+        // versions report a bad usage error (129) which we ignore here␊
+        if (129 == $return) {␊
+            $this->cache['inTags'][$commit] = array();␊
             return array();␊
-            // Ugly emergency fix, needs to be cleaned.␊
+        }␊
+        // any other error should of course get noted␊
+        if (0 != $return) {␊
             throw new IDF_Scm_Exception(sprintf($this->error_tpl,␊
                                                 $cmd, $return,␊
                                                 implode("\n", $out)));␊
 ␊
     /**␊
      * @see IDF_Scm::getDiffPathStripLevel()␊
-     */ ␊
+     */␊
     public function getDiffPathStripLevel()␊
     {␊
         return 1;␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags