summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--make_patchnum.pl2
1 files changed, 2 insertions, 0 deletions
diff --git a/make_patchnum.pl b/make_patchnum.pl
index 1644d419d6..55acb92850 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");