From: Zefram <zefram@fysh.org>
Date: Sun, 27 Sep 2009 13:30:41 +0000 (+0200)
Subject: git config lossage
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=326df896fec9493c512db76eb6738c3ce3ba9097;p=p5sagit%2Fp5-mst-13.2.git

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.
---

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");