Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix unwritable directory issue due to misordered chmod call.
[rsync/rsync.git]
/
packaging
/
patch-update
diff --git
a/packaging/patch-update
b/packaging/patch-update
index
dba8e47
..
4ac01eb
100755
(executable)
--- a/
packaging/patch-update
+++ b/
packaging/patch-update
@@
-32,7
+32,7
@@
die "No '$patches_dir' directory was found.\n" unless -d $patches_dir;
die "No '.git' directory present in the current dir.\n" unless -d '.git';
require 'packaging/git-status.pl';
die "No '.git' directory present in the current dir.\n" unless -d '.git';
require 'packaging/git-status.pl';
-check_git_state($master_branch, !$skip_branch_check, 1);
+
my $starting_branch =
check_git_state($master_branch, !$skip_branch_check, 1);
my $master_commit;
open PIPE, '-|', "git log -1 --no-color $master_branch" or die $!;
my $master_commit;
open PIPE, '-|', "git log -1 --no-color $master_branch" or die $!;
@@
-124,7
+124,7
@@
if ($incl_generated_files) {
}
sleep 1 while $last_touch >= time;
}
sleep 1 while $last_touch >= time;
-system "git checkout $
master
_branch" and exit 1;
+system "git checkout $
starting
_branch" and exit 1;
exit;
exit;