"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file ".git/hooks/pre-rebase.sample" between
pacpl-6.1.0.tar.bz2 and pacpl-6.1.2.tar.bz2

About: Perl Audio Converter is a tool for converting multiple audio types from one format to another.

pre-rebase.sample  (pacpl-6.1.0.tar.bz2):pre-rebase.sample  (pacpl-6.1.2.tar.bz2)
skipping to change at line 61 skipping to change at line 61
fi fi
# Is topic ever merged to next? If so you should not be rebasing it. # Is topic ever merged to next? If so you should not be rebasing it.
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
only_next_2=`git rev-list ^master ${publish} | sort` only_next_2=`git rev-list ^master ${publish} | sort`
if test "$only_next_1" = "$only_next_2" if test "$only_next_1" = "$only_next_2"
then then
not_in_topic=`git rev-list "^$topic" master` not_in_topic=`git rev-list "^$topic" master`
if test -z "$not_in_topic" if test -z "$not_in_topic"
then then
echo >&2 "$topic is already up to date with master" echo >&2 "$topic is already up-to-date with master"
exit 1 ;# we could allow it, but there is no point. exit 1 ;# we could allow it, but there is no point.
else else
exit 0 exit 0
fi fi
else else
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
/usr/bin/perl -e ' /usr/bin/perl -e '
my $topic = $ARGV[0]; my $topic = $ARGV[0];
my $msg = "* $topic has commits already merged to public branch:\ n"; my $msg = "* $topic has commits already merged to public branch:\ n";
my (%not_in_next) = map { my (%not_in_next) = map {
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)