Skip to content

L
liblongpath-rsync
Commit e5e6d3c4 authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

Get the branch set right before listing names and handling --delete.

parent 016ce715
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
packaging/branch-from-patch
View file @ e5e6d3c4
...@@ -13,6 +13,9 @@ use Getopt::Long; ...@@ -13,6 +13,9 @@ use Getopt::Long;
); );
&usage if $help_opt; &usage if $help_opt;
require 'packaging/git-status.pl';
check_git_state($master_branch, !$skip_branch_check, 1);
my %local_branch; my %local_branch;
open PIPE, '-|', 'git branch -l' or die "Unable to fork: $!\n"; open PIPE, '-|', 'git branch -l' or die "Unable to fork: $!\n";
while (<PIPE>) { while (<PIPE>) {
...@@ -30,9 +33,6 @@ if ($delete_local_branches) { ...@@ -30,9 +33,6 @@ if ($delete_local_branches) {
%local_branch = ( ); %local_branch = ( );
} }
require 'packaging/git-status.pl';
check_git_state($master_branch, !$skip_branch_check, 1);
my @patch_list; my @patch_list;
foreach (@ARGV) { foreach (@ARGV) {
if (!-f $_) { if (!-f $_) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment