From: Wayne Davison <wayned@samba.org>
Date: Sat, 19 Mar 2011 23:34:37 +0000 (-0700)
Subject: Get the branch set right before listing names and handling --delete.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/e5e6d3c410e4ca2d9b70def299c21a90245b41b8?hp=016ce7156881c1ea292ff115e5a0cc26e05b2ced

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

diff --git a/packaging/branch-from-patch b/packaging/branch-from-patch
index e555f00b..469f3d60 100755
--- a/packaging/branch-from-patch
+++ b/packaging/branch-from-patch
@@ -13,6 +13,9 @@ use Getopt::Long;
 );
 &usage if $help_opt;
 
+require 'packaging/git-status.pl';
+check_git_state($master_branch, !$skip_branch_check, 1);
+
 my %local_branch;
 open PIPE, '-|', 'git branch -l' or die "Unable to fork: $!\n";
 while (<PIPE>) {
@@ -30,9 +33,6 @@ if ($delete_local_branches) {
     %local_branch = ( );
 }
 
-require 'packaging/git-status.pl';
-check_git_state($master_branch, !$skip_branch_check, 1);
-
 my @patch_list;
 foreach (@ARGV) {
     if (!-f $_) {