diff options
| author | David Mitchell <davem@iabyn.com> | 2010-07-03 16:47:05 +0100 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2010-07-03 16:47:05 +0100 |
| commit | 9077509c9b9bc1871867a5fba4351b95c670298d (patch) | |
| tree | 43931c300232d056a3a54a648d9875377a43e201 | |
| parent | 40c852dee6a247b996f2c759f997f7c7c89a47b3 (diff) | |
| download | perl-9077509c9b9bc1871867a5fba4351b95c670298d.tar.gz | |
make_patchnum.pl: handle not on a branch properly
| -rw-r--r-- | make_patchnum.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make_patchnum.pl b/make_patchnum.pl index ac32808071..03cb54a02e 100644 --- a/make_patchnum.pl +++ b/make_patchnum.pl @@ -133,7 +133,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) = map { /\* ([^(]\S*)/ ? $1 : "" } backtick("git branch"); my ($remote,$merge); if (length $branch) { $merge= backtick("git config branch.$branch.merge"); |