In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/326df896fec9493c512db76eb6738c3ce3ba9097?hp=85269948cc8951473fc68344aef336c43580ee70>

- Log -----------------------------------------------------------------
commit 326df896fec9493c512db76eb6738c3ce3ba9097
Author: Zefram <[email protected]>
Date:   Sun Sep 27 15:30:41 2009 +0200

    git config lossage
    
    The git that I have installed (Debian etch) doesn't support "git
    config".
    This causes nasty failure in make_patchnum.pl, where it gets a help
    message from git, and then blindly interpolates that message into a
    command that it passes to the shell for execution.  The attached patch
    fixes this.
-----------------------------------------------------------------------

Summary of changes:
 make_patchnum.pl |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/make_patchnum.pl b/make_patchnum.pl
index 1644d41..55acb92 100644
--- a/make_patchnum.pl
+++ b/make_patchnum.pl
@@ -137,8 +137,10 @@ elsif (-d "$srcdir/.git") {
     my ($remote,$merge);
     if (length $branch) {
         $merge= backtick("git config branch.$branch.merge");
+        $merge = "" unless $? == 0;
         $merge =~ s!^refs/heads/!!;
         $remote= backtick("git config branch.$branch.remote");
+        $remote = "" unless $? == 0;
     }
     $commit_id = backtick("git rev-parse HEAD");
     $describe = backtick("git describe");

--
Perl5 Master Repository

Reply via email to