gollum 2.2.1 → 2.2.2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of gollum might be problematic. Click here for more details.

Files changed (166) hide show
  1. data/Gemfile +1 -1
  2. data/README.md +24 -1
  3. data/Rakefile +2 -2
  4. data/bin/gollum +1 -1
  5. data/gollum.gemspec +24 -169
  6. data/lib/gollum.rb +1 -1
  7. data/lib/gollum/frontend/app.rb +12 -7
  8. data/lib/gollum/frontend/helpers.rb +6 -0
  9. data/lib/gollum/frontend/public/gollum/livepreview/images/lr_24.png +0 -0
  10. data/lib/gollum/frontend/public/gollum/livepreview/index.html +0 -6
  11. data/lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js +0 -2
  12. data/lib/gollum/frontend/public/gollum/livepreview/licenses/licenses.txt +7 -0
  13. data/lib/gollum/frontend/public/gollum/livepreview/licenses/templarian_windowsicons/license.txt +40 -0
  14. data/lib/gollum/gitcode.rb +47 -0
  15. data/lib/gollum/markup.rb +58 -8
  16. data/lib/gollum/wiki.rb +7 -2
  17. data/templates/helper_wiki.rb +9 -0
  18. metadata +261 -429
  19. data/test/examples/empty.git/HEAD +0 -1
  20. data/test/examples/empty.git/config +0 -5
  21. data/test/examples/empty.git/description +0 -1
  22. data/test/examples/empty.git/hooks/applypatch-msg.sample +0 -15
  23. data/test/examples/empty.git/hooks/commit-msg.sample +0 -24
  24. data/test/examples/empty.git/hooks/post-commit.sample +0 -8
  25. data/test/examples/empty.git/hooks/post-receive.sample +0 -15
  26. data/test/examples/empty.git/hooks/post-update.sample +0 -8
  27. data/test/examples/empty.git/hooks/pre-applypatch.sample +0 -14
  28. data/test/examples/empty.git/hooks/pre-commit.sample +0 -46
  29. data/test/examples/empty.git/hooks/pre-rebase.sample +0 -169
  30. data/test/examples/empty.git/hooks/prepare-commit-msg.sample +0 -36
  31. data/test/examples/empty.git/hooks/update.sample +0 -128
  32. data/test/examples/empty.git/info/exclude +0 -6
  33. data/test/examples/empty.git/objects/info/.gitkeep +0 -0
  34. data/test/examples/empty.git/objects/pack/.gitkeep +0 -0
  35. data/test/examples/empty.git/refs/heads/.gitkeep +0 -0
  36. data/test/examples/lotr.git/COMMIT_EDITMSG +0 -1
  37. data/test/examples/lotr.git/HEAD +0 -1
  38. data/test/examples/lotr.git/ORIG_HEAD +0 -1
  39. data/test/examples/lotr.git/config +0 -12
  40. data/test/examples/lotr.git/description +0 -1
  41. data/test/examples/lotr.git/index +0 -0
  42. data/test/examples/lotr.git/info/exclude +0 -6
  43. data/test/examples/lotr.git/logs/HEAD +0 -7
  44. data/test/examples/lotr.git/logs/refs/heads/master +0 -7
  45. data/test/examples/lotr.git/objects/06/131480411710c92a82fe2d1e76932c70feb2e5 +0 -0
  46. data/test/examples/lotr.git/objects/0a/de1e2916346d4c1f2fb63b863fd3c16808fe44 +0 -0
  47. data/test/examples/lotr.git/objects/0d/c9016ca928c78d5421a99a53b379b53929221e +0 -0
  48. data/test/examples/lotr.git/objects/0e/d8cbe0a25235bd867e65193c7d837c66b328ef +0 -3
  49. data/test/examples/lotr.git/objects/12/629d666c5e3178f82f533f543d61b53dc78c0b +0 -0
  50. data/test/examples/lotr.git/objects/1c/79ddc69707f7b164bc2ea58beb5d8965ff6bd0 +0 -0
  51. data/test/examples/lotr.git/objects/1d/b89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 +0 -2
  52. data/test/examples/lotr.git/objects/24/49c2681badfd3c189e8ed658dacffe8ba48fe5 +0 -0
  53. data/test/examples/lotr.git/objects/25/4bdc1ba27d8b8a794538a8522d9a2b56ec2dd9 +0 -0
  54. data/test/examples/lotr.git/objects/27/680b0fce1abfbc528e7aa53d92645852d52eb6 +0 -0
  55. data/test/examples/lotr.git/objects/2c/b9156ad383914561a8502fc70f5a1d887e48ad +0 -4
  56. data/test/examples/lotr.git/objects/45/3b250f979c7bd6dfb62640c944c982ae6721ee +0 -0
  57. data/test/examples/lotr.git/objects/45/f319ee12f2b551b901b22e72602963c366fff1 +0 -0
  58. data/test/examples/lotr.git/objects/46/a697caf435815bb07bbce947fc2d58be15f087 +0 -0
  59. data/test/examples/lotr.git/objects/4c/45c2b4e297a726c3d3f66886f35373e48fe1c5 +0 -2
  60. data/test/examples/lotr.git/objects/4e/023f460ce466e154ca09d8774c79ad5a53fc15 +0 -0
  61. data/test/examples/lotr.git/objects/5d/cac289a8603188d2c5caf481dcba2985126aaa +0 -0
  62. data/test/examples/lotr.git/objects/60/f12f4254f58801b9ee7db7bca5fa8aeefaa56b +0 -0
  63. data/test/examples/lotr.git/objects/62/9aa678272b017a4d136d35e77ac94d80b08dc2 +0 -1
  64. data/test/examples/lotr.git/objects/6e/48abfc56565574859e081ee58eae655d48cf71 +0 -0
  65. data/test/examples/lotr.git/objects/71/4323c104239440a5c66ab12a67ed07a83c404f +0 -0
  66. data/test/examples/lotr.git/objects/7b/60c5a20a501a70f2317fa0ef763e1e2ce22d6b +0 -0
  67. data/test/examples/lotr.git/objects/7d/981cd984ad589e3cf00d8122170c6f7d685979 +0 -0
  68. data/test/examples/lotr.git/objects/84/0ec5b1ba1320e8ec443f28f99566f615d5af10 +0 -0
  69. data/test/examples/lotr.git/objects/93/6b83ee0dd8837adb82511e40d5e4ebe59bb675 +0 -0
  70. data/test/examples/lotr.git/objects/94/523d7ae48aeba575099dd12926420d8fd0425d +0 -2
  71. data/test/examples/lotr.git/objects/94/9a9cc3119b9c98817f375e976d2bb5e2a42809 +0 -0
  72. data/test/examples/lotr.git/objects/96/97dc65e095658bbd1b8e8678e08881e86d32f1 +0 -0
  73. data/test/examples/lotr.git/objects/9b/e95b960ac388d4e7db55f610f828e9c31344e6 +0 -0
  74. data/test/examples/lotr.git/objects/a3/1ca2a7c352c92531a8b99815d15843b259e814 +0 -0
  75. data/test/examples/lotr.git/objects/a6/59b3763b822dd97544621fd0beef162ea37b14 +0 -4
  76. data/test/examples/lotr.git/objects/a8/ad3c09dd842a3517085bfadd37718856dee813 +0 -0
  77. data/test/examples/lotr.git/objects/aa/b61fe89d56f8614c0a8151da34f939dcedfa68 +0 -0
  78. data/test/examples/lotr.git/objects/b0/de6e794dfdc7ef3400e894225bfe23308aae5c +0 -0
  79. data/test/examples/lotr.git/objects/b1/6b3d9fad9d78e5a669e7f33d94c96da374eccd +0 -0
  80. data/test/examples/lotr.git/objects/bc/4b5fc0ce2c2ba3acef6647e4f67256ee45ab60 +0 -0
  81. data/test/examples/lotr.git/objects/c3/b43e9f08966b088e7a0192e436b7a884542e05 +0 -0
  82. data/test/examples/lotr.git/objects/c9/6a7645db5d4c76389e77cd103ef3ed77d81e4c +0 -0
  83. data/test/examples/lotr.git/objects/ca/7355dc497e9729fbaf0c0e3f424b86afef5614 +0 -0
  84. data/test/examples/lotr.git/objects/cf/ea406f5f77afc7fb673a43e97721234385b1bd +0 -2
  85. data/test/examples/lotr.git/objects/d5/29304506d37f544675244c335d85cab5d29966 +0 -0
  86. data/test/examples/lotr.git/objects/dc/596d6b2dd89ab05c66f4abd7d5eb706bc17f19 +0 -0
  87. data/test/examples/lotr.git/objects/ec/da3205bee14520aab5a7bb307392064b938e83 +0 -0
  88. data/test/examples/lotr.git/objects/f4/84ebb1f40f8eb20d1bcd8d1d71934d2b8ae961 +0 -0
  89. data/test/examples/lotr.git/objects/fa/e7ef5344202bba4129abdc13060d9297d99465 +0 -3
  90. data/test/examples/lotr.git/objects/fb/c5dd7d807707b4a0a97c1182fecfef1eced5df +0 -1
  91. data/test/examples/lotr.git/objects/fc/3eee516ff72dc9099ba00d4611eb02e5c9e634 +0 -0
  92. data/test/examples/lotr.git/objects/ff/6f7de62644369380ba73b4e4297c1a2d6f0b66 +0 -0
  93. data/test/examples/lotr.git/objects/info/packs +0 -2
  94. data/test/examples/lotr.git/objects/pack/pack-dcbeaf3f6ff6c5eb08ea2b0a2d83626e8763546b.idx +0 -0
  95. data/test/examples/lotr.git/objects/pack/pack-dcbeaf3f6ff6c5eb08ea2b0a2d83626e8763546b.pack +0 -0
  96. data/test/examples/lotr.git/packed-refs +0 -2
  97. data/test/examples/lotr.git/refs/heads/master +0 -1
  98. data/test/examples/lotr.git/refs/remotes/origin/HEAD +0 -1
  99. data/test/examples/page_file_dir.git/COMMIT_EDITMSG +0 -1
  100. data/test/examples/page_file_dir.git/HEAD +0 -1
  101. data/test/examples/page_file_dir.git/config +0 -6
  102. data/test/examples/page_file_dir.git/description +0 -1
  103. data/test/examples/page_file_dir.git/index +0 -0
  104. data/test/examples/page_file_dir.git/info/exclude +0 -6
  105. data/test/examples/page_file_dir.git/logs/HEAD +0 -1
  106. data/test/examples/page_file_dir.git/logs/refs/heads/master +0 -1
  107. data/test/examples/page_file_dir.git/objects/0c/7d27db1f575263efdcab3dc650f4502a2dbcbf +0 -0
  108. data/test/examples/page_file_dir.git/objects/22/b404803c966dd92865614d86ff22ca12e50c1e +0 -0
  109. data/test/examples/page_file_dir.git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99 +0 -0
  110. data/test/examples/page_file_dir.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6 +0 -0
  111. data/test/examples/page_file_dir.git/objects/5b/43e14e0a15fb6f08feab1773d1c0991e9f71e2 +0 -0
  112. data/test/examples/page_file_dir.git/refs/heads/master +0 -1
  113. data/test/examples/revert.git/COMMIT_EDITMSG +0 -1
  114. data/test/examples/revert.git/HEAD +0 -1
  115. data/test/examples/revert.git/config +0 -12
  116. data/test/examples/revert.git/description +0 -1
  117. data/test/examples/revert.git/index +0 -0
  118. data/test/examples/revert.git/info/exclude +0 -6
  119. data/test/examples/revert.git/logs/HEAD +0 -3
  120. data/test/examples/revert.git/logs/refs/heads/master +0 -3
  121. data/test/examples/revert.git/objects/10/2685c42018f802557f05db171f44443e8dacab +0 -0
  122. data/test/examples/revert.git/objects/20/2ced67cea93c7b6bd2928aa1daef8d1d55a20d +0 -0
  123. data/test/examples/revert.git/objects/41/76394bfa11222363c66ce7e84b5f154095b6d9 +0 -0
  124. data/test/examples/revert.git/objects/6a/69f92020f5df77af6e8813ff1232493383b708 +0 -0
  125. data/test/examples/revert.git/objects/8e/83f898e5e16ae400db59dda1017acad540f3aa +0 -0
  126. data/test/examples/revert.git/objects/b4/785957bc986dc39c629de9fac9df46972c00fc +0 -0
  127. data/test/examples/revert.git/objects/ed/6c9f63b98acf73c25b5ffbb38da557d3682023 +0 -3
  128. data/test/examples/revert.git/objects/f4/03b791119f8232b7cb0ba455c624ac6435f433 +0 -0
  129. data/test/examples/revert.git/objects/info/packs +0 -2
  130. data/test/examples/revert.git/objects/pack/pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.idx +0 -0
  131. data/test/examples/revert.git/objects/pack/pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.pack +0 -0
  132. data/test/examples/revert.git/packed-refs +0 -2
  133. data/test/examples/revert.git/refs/heads/master +0 -1
  134. data/test/examples/revert.git/refs/remotes/origin/HEAD +0 -1
  135. data/test/examples/yubiwa.git/HEAD +0 -1
  136. data/test/examples/yubiwa.git/config +0 -5
  137. data/test/examples/yubiwa.git/description +0 -1
  138. data/test/examples/yubiwa.git/info/exclude +0 -6
  139. data/test/examples/yubiwa.git/objects/10/fa2ddc4e3b4009d8a453aace10bd6148c1ad00 +0 -0
  140. data/test/examples/yubiwa.git/objects/52/4b82874327ea7cbf730389964ba7cb3de966de +0 -0
  141. data/test/examples/yubiwa.git/objects/58/3fc201cb457fb3f1480f3e1e5999b119633835 +0 -0
  142. data/test/examples/yubiwa.git/objects/87/bc1dd46ab3d3874d4e898d45dd512cc20a7cc8 +0 -1
  143. data/test/examples/yubiwa.git/objects/89/64ed1b4e21aa90e831763bbce9034bfda81b70 +0 -0
  144. data/test/examples/yubiwa.git/objects/9f/f6dd0660da5fba2d3374adb2b84fa653bb538b +0 -0
  145. data/test/examples/yubiwa.git/objects/ac/e97abf2b177815a1972d7db22f229f58c83309 +0 -0
  146. data/test/examples/yubiwa.git/objects/b1/f443863a4816628807fbf86141ebef055dda34 +0 -0
  147. data/test/examples/yubiwa.git/refs/heads/master +0 -1
  148. data/test/file_view/1_file.txt +0 -3
  149. data/test/file_view/1_file_1_folder.txt +0 -8
  150. data/test/file_view/1_folder.txt +0 -8
  151. data/test/file_view/2_files_2_folders.txt +0 -12
  152. data/test/file_view/2_files_2_folders_1_root.txt +0 -13
  153. data/test/file_view/nested_folders.txt +0 -28
  154. data/test/helper.rb +0 -66
  155. data/test/test_app.rb +0 -375
  156. data/test/test_app_helpers.rb +0 -13
  157. data/test/test_committer.rb +0 -64
  158. data/test/test_file.rb +0 -27
  159. data/test/test_file_view.rb +0 -102
  160. data/test/test_git_access.rb +0 -53
  161. data/test/test_markup.rb +0 -732
  162. data/test/test_page.rb +0 -231
  163. data/test/test_page_revert.rb +0 -57
  164. data/test/test_pages_view.rb +0 -46
  165. data/test/test_unicode.rb +0 -131
  166. data/test/test_wiki.rb +0 -509
@@ -1 +0,0 @@
1
- ref: refs/heads/master
@@ -1,5 +0,0 @@
1
- [core]
2
- repositoryformatversion = 0
3
- filemode = true
4
- bare = true
5
- ignorecase = true
@@ -1 +0,0 @@
1
- Unnamed repository; edit this file 'description' to name the repository.
@@ -1,15 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # An example hook script to check the commit log message taken by
4
- # applypatch from an e-mail message.
5
- #
6
- # The hook should exit with non-zero status after issuing an
7
- # appropriate message if it wants to stop the commit. The hook is
8
- # allowed to edit the commit message file.
9
- #
10
- # To enable this hook, rename this file to "applypatch-msg".
11
-
12
- . git-sh-setup
13
- test -x "$GIT_DIR/hooks/commit-msg" &&
14
- exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
15
- :
@@ -1,24 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # An example hook script to check the commit log message.
4
- # Called by "git commit" with one argument, the name of the file
5
- # that has the commit message. The hook should exit with non-zero
6
- # status after issuing an appropriate message if it wants to stop the
7
- # commit. The hook is allowed to edit the commit message file.
8
- #
9
- # To enable this hook, rename this file to "commit-msg".
10
-
11
- # Uncomment the below to add a Signed-off-by line to the message.
12
- # Doing this in a hook is a bad idea in general, but the prepare-commit-msg
13
- # hook is more suited to it.
14
- #
15
- # SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
16
- # grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
17
-
18
- # This example catches duplicate Signed-off-by lines.
19
-
20
- test "" = "$(grep '^Signed-off-by: ' "$1" |
21
- sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
22
- echo >&2 Duplicate Signed-off-by lines.
23
- exit 1
24
- }
@@ -1,8 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # An example hook script that is called after a successful
4
- # commit is made.
5
- #
6
- # To enable this hook, rename this file to "post-commit".
7
-
8
- : Nothing
@@ -1,15 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # An example hook script for the "post-receive" event.
4
- #
5
- # The "post-receive" script is run after receive-pack has accepted a pack
6
- # and the repository has been updated. It is passed arguments in through
7
- # stdin in the form
8
- # <oldrev> <newrev> <refname>
9
- # For example:
10
- # aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
11
- #
12
- # see contrib/hooks/ for a sample, or uncomment the next line and
13
- # rename the file to "post-receive".
14
-
15
- #. /usr/share/doc/git-core/contrib/hooks/post-receive-email
@@ -1,8 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # An example hook script to prepare a packed repository for use over
4
- # dumb transports.
5
- #
6
- # To enable this hook, rename this file to "post-update".
7
-
8
- exec git update-server-info
@@ -1,14 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # An example hook script to verify what is about to be committed
4
- # by applypatch from an e-mail message.
5
- #
6
- # The hook should exit with non-zero status after issuing an
7
- # appropriate message if it wants to stop the commit.
8
- #
9
- # To enable this hook, rename this file to "pre-applypatch".
10
-
11
- . git-sh-setup
12
- test -x "$GIT_DIR/hooks/pre-commit" &&
13
- exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
14
- :
@@ -1,46 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # An example hook script to verify what is about to be committed.
4
- # Called by "git commit" with no arguments. The hook should
5
- # exit with non-zero status after issuing an appropriate message if
6
- # it wants to stop the commit.
7
- #
8
- # To enable this hook, rename this file to "pre-commit".
9
-
10
- if git rev-parse --verify HEAD >/dev/null 2>&1
11
- then
12
- against=HEAD
13
- else
14
- # Initial commit: diff against an empty tree object
15
- against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
16
- fi
17
-
18
- # If you want to allow non-ascii filenames set this variable to true.
19
- allownonascii=$(git config hooks.allownonascii)
20
-
21
- # Cross platform projects tend to avoid non-ascii filenames; prevent
22
- # them from being added to the repository. We exploit the fact that the
23
- # printable range starts at the space character and ends with tilde.
24
- if [ "$allownonascii" != "true" ] &&
25
- # Note that the use of brackets around a tr range is ok here, (it's
26
- # even required, for portability to Solaris 10's /usr/bin/tr), since
27
- # the square bracket bytes happen to fall in the designated range.
28
- test "$(git diff --cached --name-only --diff-filter=A -z $against |
29
- LC_ALL=C tr -d '[ -~]\0')"
30
- then
31
- echo "Error: Attempt to add a non-ascii file name."
32
- echo
33
- echo "This can cause problems if you want to work"
34
- echo "with people on other platforms."
35
- echo
36
- echo "To be portable it is advisable to rename the file ..."
37
- echo
38
- echo "If you know what you are doing you can disable this"
39
- echo "check using:"
40
- echo
41
- echo " git config hooks.allownonascii true"
42
- echo
43
- exit 1
44
- fi
45
-
46
- exec git diff-index --check --cached $against --
@@ -1,169 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # Copyright (c) 2006, 2008 Junio C Hamano
4
- #
5
- # The "pre-rebase" hook is run just before "git rebase" starts doing
6
- # its job, and can prevent the command from running by exiting with
7
- # non-zero status.
8
- #
9
- # The hook is called with the following parameters:
10
- #
11
- # $1 -- the upstream the series was forked from.
12
- # $2 -- the branch being rebased (or empty when rebasing the current branch).
13
- #
14
- # This sample shows how to prevent topic branches that are already
15
- # merged to 'next' branch from getting rebased, because allowing it
16
- # would result in rebasing already published history.
17
-
18
- publish=next
19
- basebranch="$1"
20
- if test "$#" = 2
21
- then
22
- topic="refs/heads/$2"
23
- else
24
- topic=`git symbolic-ref HEAD` ||
25
- exit 0 ;# we do not interrupt rebasing detached HEAD
26
- fi
27
-
28
- case "$topic" in
29
- refs/heads/??/*)
30
- ;;
31
- *)
32
- exit 0 ;# we do not interrupt others.
33
- ;;
34
- esac
35
-
36
- # Now we are dealing with a topic branch being rebased
37
- # on top of master. Is it OK to rebase it?
38
-
39
- # Does the topic really exist?
40
- git show-ref -q "$topic" || {
41
- echo >&2 "No such branch $topic"
42
- exit 1
43
- }
44
-
45
- # Is topic fully merged to master?
46
- not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
47
- if test -z "$not_in_master"
48
- then
49
- echo >&2 "$topic is fully merged to master; better remove it."
50
- exit 1 ;# we could allow it, but there is no point.
51
- fi
52
-
53
- # Is topic ever merged to next? If so you should not be rebasing it.
54
- only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
55
- only_next_2=`git rev-list ^master ${publish} | sort`
56
- if test "$only_next_1" = "$only_next_2"
57
- then
58
- not_in_topic=`git rev-list "^$topic" master`
59
- if test -z "$not_in_topic"
60
- then
61
- echo >&2 "$topic is already up-to-date with master"
62
- exit 1 ;# we could allow it, but there is no point.
63
- else
64
- exit 0
65
- fi
66
- else
67
- not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
68
- /usr/bin/perl -e '
69
- my $topic = $ARGV[0];
70
- my $msg = "* $topic has commits already merged to public branch:\n";
71
- my (%not_in_next) = map {
72
- /^([0-9a-f]+) /;
73
- ($1 => 1);
74
- } split(/\n/, $ARGV[1]);
75
- for my $elem (map {
76
- /^([0-9a-f]+) (.*)$/;
77
- [$1 => $2];
78
- } split(/\n/, $ARGV[2])) {
79
- if (!exists $not_in_next{$elem->[0]}) {
80
- if ($msg) {
81
- print STDERR $msg;
82
- undef $msg;
83
- }
84
- print STDERR " $elem->[1]\n";
85
- }
86
- }
87
- ' "$topic" "$not_in_next" "$not_in_master"
88
- exit 1
89
- fi
90
-
91
- exit 0
92
-
93
- ################################################################
94
-
95
- This sample hook safeguards topic branches that have been
96
- published from being rewound.
97
-
98
- The workflow assumed here is:
99
-
100
- * Once a topic branch forks from "master", "master" is never
101
- merged into it again (either directly or indirectly).
102
-
103
- * Once a topic branch is fully cooked and merged into "master",
104
- it is deleted. If you need to build on top of it to correct
105
- earlier mistakes, a new topic branch is created by forking at
106
- the tip of the "master". This is not strictly necessary, but
107
- it makes it easier to keep your history simple.
108
-
109
- * Whenever you need to test or publish your changes to topic
110
- branches, merge them into "next" branch.
111
-
112
- The script, being an example, hardcodes the publish branch name
113
- to be "next", but it is trivial to make it configurable via
114
- $GIT_DIR/config mechanism.
115
-
116
- With this workflow, you would want to know:
117
-
118
- (1) ... if a topic branch has ever been merged to "next". Young
119
- topic branches can have stupid mistakes you would rather
120
- clean up before publishing, and things that have not been
121
- merged into other branches can be easily rebased without
122
- affecting other people. But once it is published, you would
123
- not want to rewind it.
124
-
125
- (2) ... if a topic branch has been fully merged to "master".
126
- Then you can delete it. More importantly, you should not
127
- build on top of it -- other people may already want to
128
- change things related to the topic as patches against your
129
- "master", so if you need further changes, it is better to
130
- fork the topic (perhaps with the same name) afresh from the
131
- tip of "master".
132
-
133
- Let's look at this example:
134
-
135
- o---o---o---o---o---o---o---o---o---o "next"
136
- / / / /
137
- / a---a---b A / /
138
- / / / /
139
- / / c---c---c---c B /
140
- / / / \ /
141
- / / / b---b C \ /
142
- / / / / \ /
143
- ---o---o---o---o---o---o---o---o---o---o---o "master"
144
-
145
-
146
- A, B and C are topic branches.
147
-
148
- * A has one fix since it was merged up to "next".
149
-
150
- * B has finished. It has been fully merged up to "master" and "next",
151
- and is ready to be deleted.
152
-
153
- * C has not merged to "next" at all.
154
-
155
- We would want to allow C to be rebased, refuse A, and encourage
156
- B to be deleted.
157
-
158
- To compute (1):
159
-
160
- git rev-list ^master ^topic next
161
- git rev-list ^master next
162
-
163
- if these match, topic has not merged in next at all.
164
-
165
- To compute (2):
166
-
167
- git rev-list master..topic
168
-
169
- if this is empty, it is fully merged to "master".
@@ -1,36 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # An example hook script to prepare the commit log message.
4
- # Called by "git commit" with the name of the file that has the
5
- # commit message, followed by the description of the commit
6
- # message's source. The hook's purpose is to edit the commit
7
- # message file. If the hook fails with a non-zero status,
8
- # the commit is aborted.
9
- #
10
- # To enable this hook, rename this file to "prepare-commit-msg".
11
-
12
- # This hook includes three examples. The first comments out the
13
- # "Conflicts:" part of a merge commit.
14
- #
15
- # The second includes the output of "git diff --name-status -r"
16
- # into the message, just before the "git status" output. It is
17
- # commented because it doesn't cope with --amend or with squashed
18
- # commits.
19
- #
20
- # The third example adds a Signed-off-by line to the message, that can
21
- # still be edited. This is rarely a good idea.
22
-
23
- case "$2,$3" in
24
- merge,)
25
- /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
26
-
27
- # ,|template,)
28
- # /usr/bin/perl -i.bak -pe '
29
- # print "\n" . `git diff --cached --name-status -r`
30
- # if /^#/ && $first++ == 0' "$1" ;;
31
-
32
- *) ;;
33
- esac
34
-
35
- # SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
36
- # grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
@@ -1,128 +0,0 @@
1
- #!/bin/sh
2
- #
3
- # An example hook script to blocks unannotated tags from entering.
4
- # Called by "git receive-pack" with arguments: refname sha1-old sha1-new
5
- #
6
- # To enable this hook, rename this file to "update".
7
- #
8
- # Config
9
- # ------
10
- # hooks.allowunannotated
11
- # This boolean sets whether unannotated tags will be allowed into the
12
- # repository. By default they won't be.
13
- # hooks.allowdeletetag
14
- # This boolean sets whether deleting tags will be allowed in the
15
- # repository. By default they won't be.
16
- # hooks.allowmodifytag
17
- # This boolean sets whether a tag may be modified after creation. By default
18
- # it won't be.
19
- # hooks.allowdeletebranch
20
- # This boolean sets whether deleting branches will be allowed in the
21
- # repository. By default they won't be.
22
- # hooks.denycreatebranch
23
- # This boolean sets whether remotely creating branches will be denied
24
- # in the repository. By default this is allowed.
25
- #
26
-
27
- # --- Command line
28
- refname="$1"
29
- oldrev="$2"
30
- newrev="$3"
31
-
32
- # --- Safety check
33
- if [ -z "$GIT_DIR" ]; then
34
- echo "Don't run this script from the command line." >&2
35
- echo " (if you want, you could supply GIT_DIR then run" >&2
36
- echo " $0 <ref> <oldrev> <newrev>)" >&2
37
- exit 1
38
- fi
39
-
40
- if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
41
- echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
42
- exit 1
43
- fi
44
-
45
- # --- Config
46
- allowunannotated=$(git config --bool hooks.allowunannotated)
47
- allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
48
- denycreatebranch=$(git config --bool hooks.denycreatebranch)
49
- allowdeletetag=$(git config --bool hooks.allowdeletetag)
50
- allowmodifytag=$(git config --bool hooks.allowmodifytag)
51
-
52
- # check for no description
53
- projectdesc=$(sed -e '1q' "$GIT_DIR/description")
54
- case "$projectdesc" in
55
- "Unnamed repository"* | "")
56
- echo "*** Project description file hasn't been set" >&2
57
- exit 1
58
- ;;
59
- esac
60
-
61
- # --- Check types
62
- # if $newrev is 0000...0000, it's a commit to delete a ref.
63
- zero="0000000000000000000000000000000000000000"
64
- if [ "$newrev" = "$zero" ]; then
65
- newrev_type=delete
66
- else
67
- newrev_type=$(git cat-file -t $newrev)
68
- fi
69
-
70
- case "$refname","$newrev_type" in
71
- refs/tags/*,commit)
72
- # un-annotated tag
73
- short_refname=${refname##refs/tags/}
74
- if [ "$allowunannotated" != "true" ]; then
75
- echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
76
- echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
77
- exit 1
78
- fi
79
- ;;
80
- refs/tags/*,delete)
81
- # delete tag
82
- if [ "$allowdeletetag" != "true" ]; then
83
- echo "*** Deleting a tag is not allowed in this repository" >&2
84
- exit 1
85
- fi
86
- ;;
87
- refs/tags/*,tag)
88
- # annotated tag
89
- if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
90
- then
91
- echo "*** Tag '$refname' already exists." >&2
92
- echo "*** Modifying a tag is not allowed in this repository." >&2
93
- exit 1
94
- fi
95
- ;;
96
- refs/heads/*,commit)
97
- # branch
98
- if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
99
- echo "*** Creating a branch is not allowed in this repository" >&2
100
- exit 1
101
- fi
102
- ;;
103
- refs/heads/*,delete)
104
- # delete branch
105
- if [ "$allowdeletebranch" != "true" ]; then
106
- echo "*** Deleting a branch is not allowed in this repository" >&2
107
- exit 1
108
- fi
109
- ;;
110
- refs/remotes/*,commit)
111
- # tracking branch
112
- ;;
113
- refs/remotes/*,delete)
114
- # delete tracking branch
115
- if [ "$allowdeletebranch" != "true" ]; then
116
- echo "*** Deleting a tracking branch is not allowed in this repository" >&2
117
- exit 1
118
- fi
119
- ;;
120
- *)
121
- # Anything else (is there anything else?)
122
- echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
123
- exit 1
124
- ;;
125
- esac
126
-
127
- # --- Finished
128
- exit 0