diff -Nru cinnamon-session-2.8.2-20151112043004/debian/changelog cinnamon-session-2.8.2-20151121043003/debian/changelog --- cinnamon-session-2.8.2-20151112043004/debian/changelog 2015-11-12 03:30:04.000000000 +0000 +++ cinnamon-session-2.8.2-20151121043003/debian/changelog 2015-11-21 03:30:03.000000000 +0000 @@ -1,8 +1,8 @@ -cinnamon-session (2.8.2-20151112043004-trusty) trusty; urgency=medium +cinnamon-session (2.8.2-20151121043003-trusty) trusty; urgency=medium * Nightly build - -- Gwendal Le Bihan Thu, 12 Nov 2015 04:30:04 +0100 + -- Gwendal Le Bihan Sat, 21 Nov 2015 04:30:03 +0100 cinnamon-session (2.8.2) rosa; urgency=medium diff -Nru cinnamon-session-2.8.2-20151112043004/.git/config cinnamon-session-2.8.2-20151121043003/.git/config --- cinnamon-session-2.8.2-20151112043004/.git/config 2015-11-12 03:30:03.000000000 +0000 +++ cinnamon-session-2.8.2-20151121043003/.git/config 2015-11-21 03:30:03.000000000 +0000 @@ -4,8 +4,8 @@ bare = false logallrefupdates = true [remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* url = git://github.com/linuxmint/cinnamon-session.git + fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master diff -Nru cinnamon-session-2.8.2-20151112043004/.git/hooks/pre-commit.sample cinnamon-session-2.8.2-20151121043003/.git/hooks/pre-commit.sample --- cinnamon-session-2.8.2-20151112043004/.git/hooks/pre-commit.sample 2015-11-12 03:30:01.000000000 +0000 +++ cinnamon-session-2.8.2-20151121043003/.git/hooks/pre-commit.sample 2015-11-21 03:30:01.000000000 +0000 @@ -15,13 +15,13 @@ against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 fi -# If you want to allow non-ascii filenames set this variable to true. -allownonascii=$(git config hooks.allownonascii) +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) # Redirect output to stderr. exec 1>&2 -# Cross platform projects tend to avoid non-ascii filenames; prevent +# Cross platform projects tend to avoid non-ASCII filenames; prevent # them from being added to the repository. We exploit the fact that the # printable range starts at the space character and ends with tilde. if [ "$allownonascii" != "true" ] && @@ -31,18 +31,17 @@ test $(git diff --cached --name-only --diff-filter=A -z $against | LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 then - echo "Error: Attempt to add a non-ascii file name." - echo - echo "This can cause problems if you want to work" - echo "with people on other platforms." - echo - echo "To be portable it is advisable to rename the file ..." - echo - echo "If you know what you are doing you can disable this" - echo "check using:" - echo - echo " git config hooks.allownonascii true" - echo + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF exit 1 fi diff -Nru cinnamon-session-2.8.2-20151112043004/.git/hooks/pre-push.sample cinnamon-session-2.8.2-20151121043003/.git/hooks/pre-push.sample --- cinnamon-session-2.8.2-20151112043004/.git/hooks/pre-push.sample 1970-01-01 00:00:00.000000000 +0000 +++ cinnamon-session-2.8.2-20151121043003/.git/hooks/pre-push.sample 2015-11-21 03:30:01.000000000 +0000 @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff -Nru cinnamon-session-2.8.2-20151112043004/.git/hooks/update.sample cinnamon-session-2.8.2-20151121043003/.git/hooks/update.sample --- cinnamon-session-2.8.2-20151112043004/.git/hooks/update.sample 2015-11-12 03:30:01.000000000 +0000 +++ cinnamon-session-2.8.2-20151121043003/.git/hooks/update.sample 2015-11-21 03:30:01.000000000 +0000 @@ -38,7 +38,7 @@ fi if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "Usage: $0 " >&2 + echo "usage: $0 " >&2 exit 1 fi Binary files /tmp/h9aSsLk9GL/cinnamon-session-2.8.2-20151112043004/.git/index and /tmp/oEjnRyCNhy/cinnamon-session-2.8.2-20151121043003/.git/index differ diff -Nru cinnamon-session-2.8.2-20151112043004/.git/logs/HEAD cinnamon-session-2.8.2-20151121043003/.git/logs/HEAD --- cinnamon-session-2.8.2-20151112043004/.git/logs/HEAD 2015-11-12 03:30:03.000000000 +0000 +++ cinnamon-session-2.8.2-20151121043003/.git/logs/HEAD 2015-11-21 03:30:03.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 08156bbfcf84b6767261c68f0ad17000ac12f7e3 root 1447299003 +0100 clone: from git://github.com/linuxmint/cinnamon-session.git +0000000000000000000000000000000000000000 08156bbfcf84b6767261c68f0ad17000ac12f7e3 root 1448076603 +0100 clone: from git://github.com/linuxmint/cinnamon-session.git diff -Nru cinnamon-session-2.8.2-20151112043004/.git/logs/refs/heads/master cinnamon-session-2.8.2-20151121043003/.git/logs/refs/heads/master --- cinnamon-session-2.8.2-20151112043004/.git/logs/refs/heads/master 2015-11-12 03:30:03.000000000 +0000 +++ cinnamon-session-2.8.2-20151121043003/.git/logs/refs/heads/master 2015-11-21 03:30:03.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 08156bbfcf84b6767261c68f0ad17000ac12f7e3 root 1447299003 +0100 clone: from git://github.com/linuxmint/cinnamon-session.git +0000000000000000000000000000000000000000 08156bbfcf84b6767261c68f0ad17000ac12f7e3 root 1448076603 +0100 clone: from git://github.com/linuxmint/cinnamon-session.git diff -Nru cinnamon-session-2.8.2-20151112043004/.git/logs/refs/remotes/origin/HEAD cinnamon-session-2.8.2-20151121043003/.git/logs/refs/remotes/origin/HEAD --- cinnamon-session-2.8.2-20151112043004/.git/logs/refs/remotes/origin/HEAD 1970-01-01 00:00:00.000000000 +0000 +++ cinnamon-session-2.8.2-20151121043003/.git/logs/refs/remotes/origin/HEAD 2015-11-21 03:30:03.000000000 +0000 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 08156bbfcf84b6767261c68f0ad17000ac12f7e3 root 1448076603 +0100 clone: from git://github.com/linuxmint/cinnamon-session.git Binary files /tmp/h9aSsLk9GL/cinnamon-session-2.8.2-20151112043004/.git/objects/pack/pack-1f7dc0adef70e5c584198aa56b9bd0d0b0a87368.idx and /tmp/oEjnRyCNhy/cinnamon-session-2.8.2-20151121043003/.git/objects/pack/pack-1f7dc0adef70e5c584198aa56b9bd0d0b0a87368.idx differ Binary files /tmp/h9aSsLk9GL/cinnamon-session-2.8.2-20151112043004/.git/objects/pack/pack-1f7dc0adef70e5c584198aa56b9bd0d0b0a87368.pack and /tmp/oEjnRyCNhy/cinnamon-session-2.8.2-20151121043003/.git/objects/pack/pack-1f7dc0adef70e5c584198aa56b9bd0d0b0a87368.pack differ Binary files /tmp/h9aSsLk9GL/cinnamon-session-2.8.2-20151112043004/.git/objects/pack/pack-64a477ee9ef2db14183ce507f413c5f98b2e261e.idx and /tmp/oEjnRyCNhy/cinnamon-session-2.8.2-20151121043003/.git/objects/pack/pack-64a477ee9ef2db14183ce507f413c5f98b2e261e.idx differ Binary files /tmp/h9aSsLk9GL/cinnamon-session-2.8.2-20151112043004/.git/objects/pack/pack-64a477ee9ef2db14183ce507f413c5f98b2e261e.pack and /tmp/oEjnRyCNhy/cinnamon-session-2.8.2-20151121043003/.git/objects/pack/pack-64a477ee9ef2db14183ce507f413c5f98b2e261e.pack differ diff -Nru cinnamon-session-2.8.2-20151112043004/.git/packed-refs cinnamon-session-2.8.2-20151121043003/.git/packed-refs --- cinnamon-session-2.8.2-20151112043004/.git/packed-refs 2015-11-12 03:30:03.000000000 +0000 +++ cinnamon-session-2.8.2-20151121043003/.git/packed-refs 2015-11-21 03:30:03.000000000 +0000 @@ -1,4 +1,4 @@ -# pack-refs with: peeled +# pack-refs with: peeled fully-peeled 01efb494148fe8a5bf0fc1c565479ee0c07a003c refs/remotes/origin/2.4-betsy 9c2753150aa86319aba75bc4ea95377e4e3cd517 refs/remotes/origin/2.4-maintenance 08156bbfcf84b6767261c68f0ad17000ac12f7e3 refs/remotes/origin/master