From 6eda9412f8dc717200dec22c57afdd2a46edfa8e Mon Sep 17 00:00:00 2001
From: Stuart Henderson <sthen@cvs.openbsd.org>
Date: Mon, 25 Mar 2013 20:09:46 +0000
Subject: import perl 5.16.3 from CPAN - worked on by Andrew Fresh and myself

---
 gnu/usr.bin/perl/make_patchnum.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gnu/usr.bin/perl/make_patchnum.pl')

diff --git a/gnu/usr.bin/perl/make_patchnum.pl b/gnu/usr.bin/perl/make_patchnum.pl
index ac328080710..9d83dd59f87 100644
--- a/gnu/usr.bin/perl/make_patchnum.pl
+++ b/gnu/usr.bin/perl/make_patchnum.pl
@@ -17,7 +17,7 @@ make_patchnum.pl - make patchnum
 
 This program creates the files holding the information
 about locally applied patches to the source code. The created
-files are  C<git_version.h> and C<lib/Config_git.pl>.
+files are  F<git_version.h> and F<lib/Config_git.pl>.
 
 =head2 C<lib/Config_git.pl>
 
@@ -134,6 +134,7 @@ if (my $patch_file= read_file(".patch")) {
 elsif (-d "$srcdir/.git") {
     # git branch | awk 'BEGIN{ORS=""} /\*/ { print $2 }'
     ($branch) = map { /\* ([^(]\S*)/ ? $1 : () } backtick("git branch");
+    $branch //= "";
     my ($remote,$merge);
     if (length $branch) {
         $merge= backtick("git config branch.$branch.merge");
-- 
cgit v1.2.3