diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-03-25 20:09:46 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-03-25 20:09:46 +0000 |
| commit | 6eda9412f8dc717200dec22c57afdd2a46edfa8e (patch) | |
| tree | c835d11c3e3f90de6a8561320ec54f077bfd358f /gnu/usr.bin/perl/make_patchnum.pl | |
| parent | 19adbb7d6dbd1516758cad91978165088a19e917 (diff) | |
import perl 5.16.3 from CPAN - worked on by Andrew Fresh and myself
Diffstat (limited to 'gnu/usr.bin/perl/make_patchnum.pl')
| -rw-r--r-- | gnu/usr.bin/perl/make_patchnum.pl | 3 |
1 files changed, 2 insertions, 1 deletions
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"); |