embedaddon/rsync/packaging/patch-update - diff

Return to patch-update CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync / packaging

version 1.1.1.1, 2012/02/17 15:09:30	version 1.1.1.2, 2013/10/14 07:51:14
Line 32 die "No '$patches_dir' directory was found.\n" unless	Line 32 die "No '$patches_dir' directory was found.\n" unless
die "No '.git' directory present in the current dir.\n" unless -d '.git';	die "No '.git' directory present in the current dir.\n" unless -d '.git';

require 'packaging/git-status.pl';	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;	my $master_commit;
open PIPE, '-\|', "git log -1 --no-color $master_branch" or die $!;	open PIPE, '-\|', "git log -1 --no-color $master_branch" or die $!;
Line 124 if ($incl_generated_files) {	Line 124 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;