Changeset 1536

Timestamp:

05/13/12 11:41:55 (13 months ago)

Author:

bruno

Message:

• Improve git support for pb_vcs_get_uri (Eric Anderson) as for the previous patches

File:

• devel/pb-modules/lib/ProjectBuilder/VCS.pm (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -266 +266 @@
     chomp($res);
 } elsif ($scheme =~ /^git/) {
-    open(GITRC,".git/gitrc/") || return("");
+    open(GIT,"git --git-dir=$dir/.git remote -v |") || return("");
     while (<GITRC>) {
-        ($void,$res) = split(/^default.*=/) if (/^default.*=/);
+        next unless (/^origin\s+(\S+) \(push\)$/);
+        return $1;
     }
     close(GITRC);
-    chomp($res);
+    warn "Unable to find origin remote for $dir";
+    return "";
 } elsif ($scheme =~ /^cvs/) {
     # This path is always the root path of CVS, but we may be below