Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
016ce71
)
Get the branch set right before listing names and handling --delete.
author
Wayne Davison
<wayned@samba.org>
Sat, 19 Mar 2011 23:34:37 +0000
(16:34 -0700)
committer
Wayne Davison
<wayned@samba.org>
Sat, 19 Mar 2011 23:34:37 +0000
(16:34 -0700)
packaging/branch-from-patch
patch
|
blob
|
blame
|
history
diff --git
a/packaging/branch-from-patch
b/packaging/branch-from-patch
index
e555f00
..
469f3d6
100755
(executable)
--- a/
packaging/branch-from-patch
+++ b/
packaging/branch-from-patch
@@
-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;
open PIPE, '-|', 'git branch -l' or die "Unable to fork: $!\n";
while (<PIPE>) {
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 = ( );
}
%local_branch = ( );
}
-require 'packaging/git-status.pl';
-check_git_state($master_branch, !$skip_branch_check, 1);
-
my @patch_list;
foreach (@ARGV) {
if (!-f $_) {
my @patch_list;
foreach (@ARGV) {
if (!-f $_) {