#!/usr/bin/perl

my $urlbase = "";
my $revision = "";

# Read the output of the shell command "svn info" into an array
# of lines. Then iterate those looking for lines that match URL
# or Revision regular expressions.

my @svninfo = `svn info`;

if ($? != 0) {
    my @gitinfo = `git status`;
    if (@gitinfo[0] eq "# On branch master\n" &&
        @gitinfo[1] eq "nothing to commit (working directory clean)\n") {
        @svninfo = `git svn info`;
    }
}

foreach (@svninfo) {
    if (/^URL:\s*(.*?)$/) {
        $urlbase = $1;
    }
    elsif (/^Revision:\s*(.*?)$/) {
        $revision = $1;
    }
}

# get the version number from ant
my $version = "0.0.0";
if (($#ARGV + 1) > 0) {
    $version = $ARGV[0];
}

# create a file, buildstring.txt, and print a reasonable URL. Sadly,
# real svn urls aren't this reasonable.
open(BUILDSTRING, ">buildstring.txt") or die "Can create buildstring.txt";
print BUILDSTRING "$version $urlbase?revision=$revision\n";
close BUILDSTRING;

#!/usr/bin/perl

my $urlbase = "";
my $revision = "";

# Read the output of the shell command "svn info" into an array
# of lines. Then iterate those looking for lines that match URL
# or Revision regular expressions.

my @svninfo = `svn info`;

if ($? != 0) {
    @svninfo = `git svn info`;
}

foreach (@svninfo) {
    if (/^URL:\s*(.*?)$/) {
        $urlbase = $1;
    }
    elsif (/^Revision:\s*(.*?)$/) {
        $revision = $1;
    }
}

# get the version number from ant
my $version = "0.0.0";
if (($#ARGV + 1) > 0) {
    $version = $ARGV[0];
}

# create a file, buildstring.txt, and print a reasonable URL. Sadly,
# real svn urls aren't this reasonable.
open(BUILDSTRING, ">buildstring.txt") or die "Can create buildstring.txt";
print BUILDSTRING "$version $urlbase?revision=$revision\n";
close BUILDSTRING;

--- 
+++ 
@@ -10,11 +10,7 @@
 my @svninfo = `svn info`;
 
 if ($? != 0) {
-    my @gitinfo = `git status`;
-    if (@gitinfo[0] eq "# On branch master\n" &&
-        @gitinfo[1] eq "nothing to commit (working directory clean)\n") {
-        @svninfo = `git svn info`;
-    }
+    @svninfo = `git svn info`;
 }
 
 foreach (@svninfo) {
Modify the build string script to not generate a string unless the git branch is master and there and git status indicates a clean checkout of master.

Fix script

Try again
