Semi-automated update for latest git commit

pull/209/head
Jesus Alvarez 7 years ago
parent 8f66dd7e08
commit d047e95813
  1. 43
      packages/dkms/zfs-dkms-git/.SRCINFO
  2. 44
      packages/dkms/zfs-dkms-git/PKGBUILD
  3. BIN
      packages/dkms/zfs-dkms-git/zfs-dkms-git-2017.12.08.r3208.4e9b15696-1-x86_64.pkg.tar.xz
  4. BIN
      packages/dkms/zfs-dkms-git/zfs-dkms-git-2017.12.08.r3208.4e9b15696-1-x86_64.pkg.tar.xz.sig
  5. BIN
      packages/dkms/zfs-dkms-git/zfs-dkms-git-2017.12.08.r3208.4e9b15696-1.src.tar.gz
  6. 12
      packages/dkms/zfs-dkms-git/zfs.install
  7. 4565
      packages/dkms/zfs-dkms-git/zfs/FETCH_HEAD
  8. 1
      packages/dkms/zfs-dkms-git/zfs/HEAD
  9. 8
      packages/dkms/zfs-dkms-git/zfs/config
  10. 1
      packages/dkms/zfs-dkms-git/zfs/description
  11. 15
      packages/dkms/zfs-dkms-git/zfs/hooks/applypatch-msg.sample
  12. 24
      packages/dkms/zfs-dkms-git/zfs/hooks/commit-msg.sample
  13. 8
      packages/dkms/zfs-dkms-git/zfs/hooks/post-update.sample
  14. 14
      packages/dkms/zfs-dkms-git/zfs/hooks/pre-applypatch.sample
  15. 49
      packages/dkms/zfs-dkms-git/zfs/hooks/pre-commit.sample
  16. 53
      packages/dkms/zfs-dkms-git/zfs/hooks/pre-push.sample
  17. 169
      packages/dkms/zfs-dkms-git/zfs/hooks/pre-rebase.sample
  18. 24
      packages/dkms/zfs-dkms-git/zfs/hooks/pre-receive.sample
  19. 36
      packages/dkms/zfs-dkms-git/zfs/hooks/prepare-commit-msg.sample
  20. 128
      packages/dkms/zfs-dkms-git/zfs/hooks/update.sample
  21. 6
      packages/dkms/zfs-dkms-git/zfs/info/exclude
  22. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/01/9f0b136d80455d0f56dce958d61e50634652ca
  23. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/02/165809864a40e8f70a0f0359f2c23af51638ff
  24. 2
      packages/dkms/zfs-dkms-git/zfs/objects/04/89f767d9197df7b908e59a2938c9f264de3802
  25. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/07/bbe62c5ef888ff2b4e129bbaa2284e71607205
  26. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/09/98c8674ae2dfcaec8e72645e847d934efe9b88
  27. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/0c/d992979cefd772a6ad198c08517682f2bfad7f
  28. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/0d/18ca7b6bba5da0bb297806327a6ca5bd5056c7
  29. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/12/34f059c1a6d9e5ba0d1ebca1cbbb8f12b885e1
  30. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/16/8439d9eed2c23e965de682d95de44a454ba87e
  31. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/17/6851b05d68110cfdb39a92f267486e02c4a272
  32. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/18/dec69967842e4148b54770b70d501ffb51c36e
  33. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/1d/44caf728413ef6866d75899e5075fbd778fc3a
  34. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/21/a9a8481f604dcd2d65460ebe7dd49ca9bd9a03
  35. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/21/d7b414e138901f6e54f6964e71d00474a06cb8
  36. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/28/ae153519f5c59a4d70fc5f873f28feb10574ec
  37. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/2a/2e1ddef25d5820084ed741e173331256dbe9ef
  38. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/2b/0a58a18eab10d861819da0e6d9a51d1e988162
  39. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/2f/e5f52ba613cb0b3299fe292322470d64d0e033
  40. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/32/6648b3ac364ccd02be650b8e52e35287235d6b
  41. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/36/35ba7d783acac30d5d7749c3f520e100efc00e
  42. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/37/865892731539a8c27c6fdef8024647c50ef31c
  43. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/39/60cb692a344de2d3c5b7bea06be67a8e0d7cf5
  44. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/3a/fc82d54b5282e0044500151920acf9b7b553c3
  45. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/3b/b8d6f48e7af13d2bde61942f4456d0a5e1fc87
  46. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/3c/e66864f69603a0d5884c22f7ca58d6fc93a8c6
  47. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/3f/c7337e8eca8b52937ee482bf43b85a5e3017b6
  48. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/49/2965eca39c103d7ff15bbc146bfacadb2c7a1d
  49. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/49/7e8439666570755464e9627be45923753eb56e
  50. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/4c/7d7f24a35271e1c720945d916f35882c27ddb5
  51. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/53/49c2ade8c36ae44e86e08f2e17aaa55395502d
  52. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/57/266f11c5a69df9ece21ec3d5c1057626603a43
  53. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/5c/afe060c7bcb3bb4bfc092c5c7fdab952fe31cf
  54. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/60/2db03579b332472447eafbfdce69922ff32dc7
  55. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/68/5a20c448ea4506c3847125c465a3659c3dff7d
  56. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/69/53f676ea4bf4873de7e48c2406881c477470d9
  57. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/6d/0270a7a522faaca54d31f938b1a90e79718e47
  58. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/6d/d50d7146c77bd4abaa42f67d8ce1d52b15e456
  59. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/6f/6919db6d3ff5e67e2b4f262c770a5642a12ef6
  60. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/72/122cf017b6b6f5dc85ca1574adc3400adfe8f8
  61. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/73/7ecc0beeaf07406b5bb6cbdbbaf935f49411ac
  62. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/74/8764ab0a25c24a7d278d1bcb0a810d8dc7ea18
  63. 2
      packages/dkms/zfs-dkms-git/zfs/objects/7c/096edbb1c868708b43c4fb8389e21bf907681f
  64. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/82/4dd01f67a43763d5b535a0630135de34e0aa0d
  65. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/83/35683560c261d8f5240275dbf0386daff5b5ab
  66. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/85/e9006b60216cf9c82fbadce7c164b4de7870e4
  67. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/86/eb8ad3922eb731dc1d65a09362103f515e2145
  68. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/8d/55ffb040546046caf4012f94a084e7d57fd5fa
  69. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/90/e9048b1c1a03067a4bee51fa54ae836701eb96
  70. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/93/888838ed0c4d50371ac3d059e3ed1bd0943d24
  71. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/96/6799bb610b54a8ddbd111f49d827580e8b43fa
  72. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/96/c2b312fba60f1821b8cbe8215c46af91b9ee7d
  73. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/99/824d6dd4afbb2c44e57e43d1aaecc8f2efcbce
  74. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/9e/ac5bf0c6409db838805f0d99d7b7c853dedab1
  75. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/a0/3129956f09184b1a2cb30a7c85fcc6d373a051
  76. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/a1/42bacf8f6c85be6e6cf10609589181b5e69975
  77. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/a3/6b8f19712419a89621feceea3163908cd81f5c
  78. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/ab/aae5c41f0f91474ab2ac0b21ba7899a5aa568a
  79. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/b0/14991bfb84a196fda0b54c72ebab0ab0b601fe
  80. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/b3/7b348eeb57b0e5af99fc6a6488693f332b2cbd
  81. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/b6/b3bcb038588d91a1c7bb927b6846afb4ae08b4
  82. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/b8/49d901072f4201c72d443bd9db265157f7edd2
  83. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/c2/6c0eb3969b717ba66996cb6b30f96799986604
  84. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/c3/68e2410f017f99a48e26ad187b71b127be2084
  85. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/c4/7050c491677b22beca01a470ea181c0bd83de2
  86. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/c5/85993f13214d705182c1c3ee731cfbd2a3bc64
  87. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/c9/de4e598a5eda51c8c9be31f07628c009ee04d4
  88. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/ca/c8ab146068407afb69aa0cebe65745f0b9d353
  89. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/cc/6c1793c00e6d5f1a743b29087129a2acd69dcd
  90. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/cc/c472153cb110bc627efc9597dd398f6132e98e
  91. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/ce/24019e529653535e807c81a06849fd283c47c2
  92. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/cf/8d15a7569a3005bf504ebc9ff6ebe430060c7f
  93. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/d3/363809d2b179ef54fc07557563972e821da07c
  94. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/d4/a7d52177ad6a57dcb4cbc45fbe5692912262b4
  95. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/d6/0ebbdbd08f3d86b499c0ffb9ec635a58cd015b
  96. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/df/9459eda1b7816c3882c922b76793d4f0b633ff
  97. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/e1/833b842f949aa5db4c2b8ca3bae64bf5771af5
  98. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/e2/9b6b71899c08d44b2a3a7510015c6a01c76588
  99. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/f0/c453b8b034e8caa660f30dcab7e281f2749e21
  100. BIN
      packages/dkms/zfs-dkms-git/zfs/objects/f5/ede99c9bc36bb22efbb0f7657eed2c43aca8c2
  101. Some files were not shown because too many files have changed in this diff Show More

@ -0,0 +1,43 @@
# Generated by mksrcinfo v8
# Wed Dec 13 18:59:20 UTC 2017
pkgbase = zfs-dkms-git
pkgdesc = Kernel modules for the Zettabyte File System.
pkgver = 2017.12.08.r3208.4e9b15696
pkgrel = 1
url = http://zfsonlinux.org/
install = zfs.install
arch = x86_64
groups = archzfs-dkms-git
license = CDDL
makedepends = git
depends = spl-dkms-git
depends = zfs-utils-common-git=2017.12.08.r3208.4e9b15696
provides = zfs
conflicts = zfs-dkms
conflicts = zfs-archiso-linux
conflicts = zfs-linux-hardened
conflicts = zfs-linux-hardened-git
conflicts = zfs-linux-lts
conflicts = zfs-linux-lts-git
conflicts = zfs-linux
conflicts = zfs-linux-git
conflicts = zfs-linux-vfio
conflicts = zfs-linux-vfio-git
conflicts = zfs-linux-zen
conflicts = zfs-linux-zen-git
conflicts = zfs-archiso-linux-headers
conflicts = zfs-linux-hardened-headers
conflicts = zfs-linux-hardened-git-headers
conflicts = zfs-linux-lts-headers
conflicts = zfs-linux-lts-git-headers
conflicts = zfs-linux-headers
conflicts = zfs-linux-git-headers
conflicts = zfs-linux-vfio-headers
conflicts = zfs-linux-vfio-git-headers
conflicts = zfs-linux-zen-headers
conflicts = zfs-linux-zen-git-headers
source = git+https://github.com/zfsonlinux/zfs.git#commit=4e9b156960562373e005798575a3fbc6d66e32ff
sha256sums = SKIP
pkgname = zfs-dkms-git

@ -0,0 +1,44 @@
# Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>
#
# This PKGBUILD was generated by the archzfs build scripts located at
#
# http://github.com/archzfs/archzfs
#
#
pkgname="zfs-dkms-git"
pkgdesc="Kernel modules for the Zettabyte File System."
pkgver=2017.12.08.r3208.4e9b15696
pkgrel=1
makedepends=("git")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("git+https://github.com/zfsonlinux/zfs.git#commit=4e9b156960562373e005798575a3fbc6d66e32ff")
sha256sums=("SKIP")
license=("CDDL")
depends=("spl-dkms-git" "zfs-utils-common-git=2017.12.08.r3208.4e9b15696")
install=zfs.install
provides=("zfs")
groups=("archzfs-dkms-git")
conflicts=('zfs-dkms' 'zfs-archiso-linux' 'zfs-linux-hardened' 'zfs-linux-hardened-git' 'zfs-linux-lts' 'zfs-linux-lts-git' 'zfs-linux' 'zfs-linux-git' 'zfs-linux-vfio' 'zfs-linux-vfio-git' 'zfs-linux-zen' 'zfs-linux-zen-git' 'zfs-archiso-linux-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
build() {
cd "${srcdir}/zfs"
./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \
--datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \
--libexecdir=/usr/lib/zfs-0.7.4 --with-config=user
make
}
package() {
dkmsdir="${pkgdir}/usr/src/zfs-2017.12.08.r3208.4e9b15696"
install -d "${dkmsdir}"
cp -a ${srcdir}/zfs/. ${dkmsdir}
cd "${dkmsdir}"
make clean
make distclean
find . -name ".git*" -print0 | xargs -0 rm -fr --
scripts/dkms.mkconf -v 2017.12.08.r3208.4e9b15696 -f dkms.conf -n zfs
chmod g-w,o-w -R .
}

@ -0,0 +1,12 @@
post_install() {
# https://bugs.archlinux.org/task/52901
echo '>>> If DKMS fails to build ZFS, run this command:'
echo -e '# dkms install -m zfs/2017.12.08.r3208.4e9b15696 -k <kernel_version>\n'
echo 'If you are using ZFS on your root partition run this afterwards:'
echo '# mkinitcpio -P'
}
post_upgrade() {
post_install "$1"
}

File diff suppressed because it is too large Load Diff

@ -0,0 +1 @@
ref: refs/heads/master

@ -0,0 +1,8 @@
[core]
repositoryformatversion = 0
filemode = true
bare = true
[remote "origin"]
url = https://github.com/zfsonlinux/zfs.git
fetch = +refs/*:refs/*
mirror = true

@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

@ -0,0 +1,15 @@
#!/bin/sh
#
# An example hook script to check the commit log message taken by
# applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit. The hook is
# allowed to edit the commit message file.
#
# To enable this hook, rename this file to "applypatch-msg".
. git-sh-setup
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
:

@ -0,0 +1,24 @@
#!/bin/sh
#
# An example hook script to check the commit log message.
# Called by "git commit" with one argument, the name of the file
# that has the commit message. The hook should exit with non-zero
# status after issuing an appropriate message if it wants to stop the
# commit. The hook is allowed to edit the commit message file.
#
# To enable this hook, rename this file to "commit-msg".
# Uncomment the below to add a Signed-off-by line to the message.
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
# hook is more suited to it.
#
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
# This example catches duplicate Signed-off-by lines.
test "" = "$(grep '^Signed-off-by: ' "$1" |
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
echo >&2 Duplicate Signed-off-by lines.
exit 1
}

@ -0,0 +1,8 @@
#!/bin/sh
#
# An example hook script to prepare a packed repository for use over
# dumb transports.
#
# To enable this hook, rename this file to "post-update".
exec git update-server-info

@ -0,0 +1,14 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed
# by applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-applypatch".
. git-sh-setup
precommit="$(git rev-parse --git-path hooks/pre-commit)"
test -x "$precommit" && exec "$precommit" ${1+"$@"}
:

@ -0,0 +1,49 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
fi
# 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
# 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" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
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
# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --

@ -0,0 +1,53 @@
#!/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:
#
# <local ref> <local sha1> <remote ref> <remote sha1>
#
# 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
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 >&2 "Found WIP commit in $local_ref, not pushing"
exit 1
fi
fi
done
exit 0

@ -0,0 +1,169 @@
#!/bin/sh
#
# Copyright (c) 2006, 2008 Junio C Hamano
#
# The "pre-rebase" hook is run just before "git rebase" starts doing
# its job, and can prevent the command from running by exiting with
# non-zero status.
#
# The hook is called with the following parameters:
#
# $1 -- the upstream the series was forked from.
# $2 -- the branch being rebased (or empty when rebasing the current branch).
#
# This sample shows how to prevent topic branches that are already
# merged to 'next' branch from getting rebased, because allowing it
# would result in rebasing already published history.
publish=next
basebranch="$1"
if test "$#" = 2
then
topic="refs/heads/$2"
else
topic=`git symbolic-ref HEAD` ||
exit 0 ;# we do not interrupt rebasing detached HEAD
fi
case "$topic" in
refs/heads/??/*)
;;
*)
exit 0 ;# we do not interrupt others.
;;
esac
# Now we are dealing with a topic branch being rebased
# on top of master. Is it OK to rebase it?
# Does the topic really exist?
git show-ref -q "$topic" || {
echo >&2 "No such branch $topic"
exit 1
}
# Is topic fully merged to master?
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
if test -z "$not_in_master"
then
echo >&2 "$topic is fully merged to master; better remove it."
exit 1 ;# we could allow it, but there is no point.
fi
# 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_2=`git rev-list ^master ${publish} | sort`
if test "$only_next_1" = "$only_next_2"
then
not_in_topic=`git rev-list "^$topic" master`
if test -z "$not_in_topic"
then
echo >&2 "$topic is already up-to-date with master"
exit 1 ;# we could allow it, but there is no point.
else
exit 0
fi
else
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
/usr/bin/perl -e '
my $topic = $ARGV[0];
my $msg = "* $topic has commits already merged to public branch:\n";
my (%not_in_next) = map {
/^([0-9a-f]+) /;
($1 => 1);
} split(/\n/, $ARGV[1]);
for my $elem (map {
/^([0-9a-f]+) (.*)$/;
[$1 => $2];
} split(/\n/, $ARGV[2])) {
if (!exists $not_in_next{$elem->[0]}) {
if ($msg) {
print STDERR $msg;
undef $msg;
}
print STDERR " $elem->[1]\n";
}
}
' "$topic" "$not_in_next" "$not_in_master"
exit 1
fi
exit 0
################################################################
This sample hook safeguards topic branches that have been
published from being rewound.
The workflow assumed here is:
* Once a topic branch forks from "master", "master" is never
merged into it again (either directly or indirectly).
* Once a topic branch is fully cooked and merged into "master",
it is deleted. If you need to build on top of it to correct
earlier mistakes, a new topic branch is created by forking at
the tip of the "master". This is not strictly necessary, but
it makes it easier to keep your history simple.
* Whenever you need to test or publish your changes to topic
branches, merge them into "next" branch.
The script, being an example, hardcodes the publish branch name
to be "next", but it is trivial to make it configurable via
$GIT_DIR/config mechanism.
With this workflow, you would want to know:
(1) ... if a topic branch has ever been merged to "next". Young
topic branches can have stupid mistakes you would rather
clean up before publishing, and things that have not been
merged into other branches can be easily rebased without
affecting other people. But once it is published, you would
not want to rewind it.
(2) ... if a topic branch has been fully merged to "master".
Then you can delete it. More importantly, you should not
build on top of it -- other people may already want to
change things related to the topic as patches against your
"master", so if you need further changes, it is better to
fork the topic (perhaps with the same name) afresh from the
tip of "master".
Let's look at this example:
o---o---o---o---o---o---o---o---o---o "next"
/ / / /
/ a---a---b A / /
/ / / /
/ / c---c---c---c B /
/ / / \ /
/ / / b---b C \ /
/ / / / \ /
---o---o---o---o---o---o---o---o---o---o---o "master"
A, B and C are topic branches.
* A has one fix since it was merged up to "next".
* B has finished. It has been fully merged up to "master" and "next",
and is ready to be deleted.
* C has not merged to "next" at all.
We would want to allow C to be rebased, refuse A, and encourage
B to be deleted.
To compute (1):
git rev-list ^master ^topic next
git rev-list ^master next
if these match, topic has not merged in next at all.
To compute (2):
git rev-list master..topic
if this is empty, it is fully merged to "master".

@ -0,0 +1,24 @@
#!/bin/sh
#
# An example hook script to make use of push options.
# The example simply echoes all push options that start with 'echoback='
# and rejects all pushes when the "reject" push option is used.
#
# To enable this hook, rename this file to "pre-receive".
if test -n "$GIT_PUSH_OPTION_COUNT"
then
i=0
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
do
eval "value=\$GIT_PUSH_OPTION_$i"
case "$value" in
echoback=*)
echo "echo from the pre-receive-hook: ${value#*=}" >&2
;;
reject)
exit 1
esac
i=$((i + 1))
done
fi

@ -0,0 +1,36 @@
#!/bin/sh
#
# An example hook script to prepare the commit log message.
# Called by "git commit" with the name of the file that has the
# commit message, followed by the description of the commit
# message's source. The hook's purpose is to edit the commit
# message file. If the hook fails with a non-zero status,
# the commit is aborted.
#
# To enable this hook, rename this file to "prepare-commit-msg".
# This hook includes three examples. The first comments out the
# "Conflicts:" part of a merge commit.
#
# The second includes the output of "git diff --name-status -r"
# into the message, just before the "git status" output. It is
# commented because it doesn't cope with --amend or with squashed
# commits.
#
# The third example adds a Signed-off-by line to the message, that can
# still be edited. This is rarely a good idea.
case "$2,$3" in
merge,)
/usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
# ,|template,)
# /usr/bin/perl -i.bak -pe '
# print "\n" . `git diff --cached --name-status -r`
# if /^#/ && $first++ == 0' "$1" ;;
*) ;;
esac
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

@ -0,0 +1,128 @@
#!/bin/sh
#
# An example hook script to block unannotated tags from entering.
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
#
# To enable this hook, rename this file to "update".
#
# Config
# ------
# hooks.allowunannotated
# This boolean sets whether unannotated tags will be allowed into the
# repository. By default they won't be.
# hooks.allowdeletetag
# This boolean sets whether deleting tags will be allowed in the
# repository. By default they won't be.
# hooks.allowmodifytag
# This boolean sets whether a tag may be modified after creation. By default
# it won't be.
# hooks.allowdeletebranch
# This boolean sets whether deleting branches will be allowed in the
# repository. By default they won't be.
# hooks.denycreatebranch
# This boolean sets whether remotely creating branches will be denied
# in the repository. By default this is allowed.
#
# --- Command line
refname="$1"
oldrev="$2"
newrev="$3"
# --- Safety check
if [ -z "$GIT_DIR" ]; then
echo "Don't run this script from the command line." >&2
echo " (if you want, you could supply GIT_DIR then run" >&2
echo " $0 <ref> <oldrev> <newrev>)" >&2
exit 1
fi
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
exit 1
fi
# --- Config
allowunannotated=$(git config --bool hooks.allowunannotated)
allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
denycreatebranch=$(git config --bool hooks.denycreatebranch)
allowdeletetag=$(git config --bool hooks.allowdeletetag)
allowmodifytag=$(git config --bool hooks.allowmodifytag)
# check for no description
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
case "$projectdesc" in
"Unnamed repository"* | "")
echo "*** Project description file hasn't been set" >&2
exit 1
;;
esac
# --- Check types
# if $newrev is 0000...0000, it's a commit to delete a ref.
zero="0000000000000000000000000000000000000000"
if [ "$newrev" = "$zero" ]; then
newrev_type=delete
else
newrev_type=$(git cat-file -t $newrev)
fi
case "$refname","$newrev_type" in
refs/tags/*,commit)
# un-annotated tag
short_refname=${refname##refs/tags/}
if [ "$allowunannotated" != "true" ]; then
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
exit 1
fi
;;
refs/tags/*,delete)
# delete tag
if [ "$allowdeletetag" != "true" ]; then
echo "*** Deleting a tag is not allowed in this repository" >&2
exit 1
fi
;;
refs/tags/*,tag)
# annotated tag
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
then
echo "*** Tag '$refname' already exists." >&2
echo "*** Modifying a tag is not allowed in this repository." >&2
exit 1
fi
;;
refs/heads/*,commit)
# branch
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
echo "*** Creating a branch is not allowed in this repository" >&2
exit 1
fi
;;
refs/heads/*,delete)
# delete branch
if [ "$allowdeletebranch" != "true" ]; then
echo "*** Deleting a branch is not allowed in this repository" >&2
exit 1
fi
;;
refs/remotes/*,commit)
# tracking branch
;;
refs/remotes/*,delete)
# delete tracking branch
if [ "$allowdeletebranch" != "true" ]; then
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
exit 1
fi
;;
*)
# Anything else (is there anything else?)
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
exit 1
;;
esac
# --- Finished
exit 0

@ -0,0 +1,6 @@
# git ls-files --others --exclude-from=.git/info/exclude
# Lines that start with '#' are comments.
# For a project mostly in C, the following would be a good set of
# exclude patterns (uncomment them if you want to use them):
# *.[oa]
# *~

@ -0,0 +1,2 @@
x+)JMU0´4d040031QĐKĎ,ÉLĎË/Jex«xwĎě)77[+®šľęë¬đ>ÎUPUľ‰Ů©i™9©z‰ą “;:,Ţňř<EFBFBD>Kľůř­ô…)¶*@e榦
É9©‰yĄzŮĹ †i{óćé4ür:|Đ©fU¬ CzÔ´ÜÄĽĘř´”b˝d†ó®ń˝źĄ¶¸ŘZ!Ž—Ť[xŇźé硆§–@ŤúóĆ yY—GǢĽGBĄ*»Rb¤Mp

@ -0,0 +1,2 @@
x+)JMU020a040031QÐKÏ,ÉLÏË/Je¨<EFBFBD>]õ÷ÚIóoª25w
Ìʶý8¸ªÊ71;5-3'U/1—¡s£™Ã5¥9«'}p“dþ:KTcþÿPeUiź)Ù¹ÅzÅ©Éz™y §Ï¹W?½¥¼£Þ;Ý:òƒë¥ÿú½Hj³sóSàj•:ÔÔ÷ä³e–/»³ÌrØ%«Ù!—jáÊ6W›ô½ßðtýÌ?Y)™öÆÚ:{˜tU!

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save