From d4da0f86702202b30005811b5623f02ed19bb2fa Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 8 Dec 2010 13:28:20 -0800 Subject: [PATCH 1/9] explicitly set the local var for 1.9 --- lib/gollum/wiki.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index 888cf20a..205aed24 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -184,7 +184,8 @@ module Gollum def write_page(name, format, data, commit = {}) commit = normalize_commit(commit) index = nil - sha1 = commit_index(commit) do |index| + sha1 = commit_index(commit) do |idx| + index = idx add_to_index(index, '', name, format, data) end @@ -216,7 +217,8 @@ module Gollum dir = ::File.dirname(page.path) dir = '' if dir == '.' index = nil - sha1 = commit_index(commit) do |index| + sha1 = commit_index(commit) do |idx| + index = idx if page.name == name && page.format == format index.add(page.path, normalize(data)) else @@ -243,7 +245,8 @@ module Gollum # Returns the String SHA1 of the newly written version. def delete_page(page, commit) index = nil - sha1 = commit_index(commit) do |index| + sha1 = commit_index(commit) |idx| + index = idx index.delete(page.path) end From 54eca090ee545bf88468ef68c44b8e7b97496bb8 Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 8 Dec 2010 13:35:16 -0800 Subject: [PATCH 2/9] do or do not --- lib/gollum/wiki.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index 205aed24..18fb0c45 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -245,7 +245,7 @@ module Gollum # Returns the String SHA1 of the newly written version. def delete_page(page, commit) index = nil - sha1 = commit_index(commit) |idx| + sha1 = commit_index(commit) do |idx| index = idx index.delete(page.path) end From 25a56725f9a5331b80b832514ad7fb1325913e55 Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 8 Dec 2010 14:57:29 -0800 Subject: [PATCH 3/9] add ability to revert wiki pages --- lib/gollum/wiki.rb | 45 ++++- test/examples/revert.git/HEAD | 1 + test/examples/revert.git/config | 12 ++ test/examples/revert.git/description | 1 + .../revert.git/hooks/applypatch-msg.sample | 15 ++ .../revert.git/hooks/commit-msg.sample | 24 +++ .../revert.git/hooks/post-commit.sample | 8 + .../revert.git/hooks/post-receive.sample | 15 ++ .../revert.git/hooks/post-update.sample | 8 + .../revert.git/hooks/pre-applypatch.sample | 14 ++ .../revert.git/hooks/pre-commit.sample | 46 +++++ .../revert.git/hooks/pre-rebase.sample | 169 ++++++++++++++++++ .../hooks/prepare-commit-msg.sample | 36 ++++ test/examples/revert.git/hooks/update.sample | 128 +++++++++++++ test/examples/revert.git/index | Bin 0 -> 176 bytes test/examples/revert.git/info/exclude | 6 + test/examples/revert.git/info/refs | 3 + test/examples/revert.git/logs/HEAD | 1 + .../revert.git/logs/refs/heads/master | 1 + .../20/2ced67cea93c7b6bd2928aa1daef8d1d55a20d | Bin 0 -> 146 bytes test/examples/revert.git/objects/info/packs | 2 + ...61f8437234f74d0bacb9e0eebe52d207f5770d.idx | Bin 0 -> 1408 bytes ...1f8437234f74d0bacb9e0eebe52d207f5770d.pack | Bin 0 -> 948 bytes test/examples/revert.git/packed-refs | 3 + .../revert.git/refs/remotes/origin/HEAD | 1 + test/helper.rb | 10 ++ test/test_page.rb | 22 +++ 27 files changed, 568 insertions(+), 3 deletions(-) create mode 100644 test/examples/revert.git/HEAD create mode 100644 test/examples/revert.git/config create mode 100644 test/examples/revert.git/description create mode 100755 test/examples/revert.git/hooks/applypatch-msg.sample create mode 100755 test/examples/revert.git/hooks/commit-msg.sample create mode 100755 test/examples/revert.git/hooks/post-commit.sample create mode 100755 test/examples/revert.git/hooks/post-receive.sample create mode 100755 test/examples/revert.git/hooks/post-update.sample create mode 100755 test/examples/revert.git/hooks/pre-applypatch.sample create mode 100755 test/examples/revert.git/hooks/pre-commit.sample create mode 100755 test/examples/revert.git/hooks/pre-rebase.sample create mode 100755 test/examples/revert.git/hooks/prepare-commit-msg.sample create mode 100755 test/examples/revert.git/hooks/update.sample create mode 100644 test/examples/revert.git/index create mode 100644 test/examples/revert.git/info/exclude create mode 100644 test/examples/revert.git/info/refs create mode 100644 test/examples/revert.git/logs/HEAD create mode 100644 test/examples/revert.git/logs/refs/heads/master create mode 100644 test/examples/revert.git/objects/20/2ced67cea93c7b6bd2928aa1daef8d1d55a20d create mode 100644 test/examples/revert.git/objects/info/packs create mode 100644 test/examples/revert.git/objects/pack/pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.idx create mode 100644 test/examples/revert.git/objects/pack/pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.pack create mode 100644 test/examples/revert.git/packed-refs create mode 100644 test/examples/revert.git/refs/remotes/origin/HEAD diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index 18fb0c45..6aa227ea 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -182,7 +182,6 @@ module Gollum # # Returns the String SHA1 of the newly written version. def write_page(name, format, data, commit = {}) - commit = normalize_commit(commit) index = nil sha1 = commit_index(commit) do |idx| index = idx @@ -211,7 +210,6 @@ module Gollum # # Returns the String SHA1 of the newly written version. def update_page(page, name, format, data, commit = {}) - commit = normalize_commit(commit) name ||= page.name format ||= page.format dir = ::File.dirname(page.path) @@ -312,6 +310,32 @@ module Gollum @repo.log('master', nil, log_pagination_options(options)) end + def revert_page(page, sha1, sha2 = nil, commit = {}) + if sha2.is_a?(Hash) + commit = sha2 + sha2 = nil + end + + pcommit = @repo.commit('master') + commit[:parent] = [pcommit] + commit[:tree] = write_to_real_index(pcommit.sha) do + options = {:reverse => true, :cached => true} + @repo.git.native(:apply, options) do |stdin| + stdin << full_diff_for(page, sha1, sha2) + stdin.close + end + end + + index = nil + sha1 = commit_index(commit) { |i| index = i } + dir = ::File.dirname(page.path) + dir = '' if dir == '.' + + @access.refresh + update_working_dir(index, dir, page.name, page.format) + sha1 + end + # Public: Refreshes just the cached Git reference data. This should # be called after every Gollum update. # @@ -517,10 +541,13 @@ module Gollum end def commit_index(options = {}) + normalize_commit(options) options[:parent] ||= [@repo.commit('master')] options[:parent].compact! index = self.repo.index - if parent = options[:parent][0] + if tree = options[:tree] + index.read_tree(tree) + elsif parent = options[:parent][0] index.read_tree(parent.tree.id) end yield index if block_given? @@ -529,6 +556,18 @@ module Gollum index.commit(options[:message], options[:parent], actor) end + def write_to_real_index(head_sha) + @repo.git.native('read-tree', {}, head_sha) + if yield + @repo.git.native('write-tree') + end + end + + def full_diff_for(page, sha1, sha2 = nil) + sha1, sha2 = "#{sha1}^", sha1 if sha2.nil? + repo.git.native(:diff, {}, sha1, sha2, '--', page.path) + end + # Ensures a commit hash has all the required fields for a commit. # # commit - The commit Hash details: diff --git a/test/examples/revert.git/HEAD b/test/examples/revert.git/HEAD new file mode 100644 index 00000000..cb089cd8 --- /dev/null +++ b/test/examples/revert.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/examples/revert.git/config b/test/examples/revert.git/config new file mode 100644 index 00000000..75f5c467 --- /dev/null +++ b/test/examples/revert.git/config @@ -0,0 +1,12 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true +[remote "origin"] + fetch = +refs/heads/*:refs/remotes/origin/* + url = /Users/rick/p/gollum/test/examples/revert.git +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/test/examples/revert.git/description b/test/examples/revert.git/description new file mode 100644 index 00000000..498b267a --- /dev/null +++ b/test/examples/revert.git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/examples/revert.git/hooks/applypatch-msg.sample b/test/examples/revert.git/hooks/applypatch-msg.sample new file mode 100755 index 00000000..8b2a2fe8 --- /dev/null +++ b/test/examples/revert.git/hooks/applypatch-msg.sample @@ -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 +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff --git a/test/examples/revert.git/hooks/commit-msg.sample b/test/examples/revert.git/hooks/commit-msg.sample new file mode 100755 index 00000000..b58d1184 --- /dev/null +++ b/test/examples/revert.git/hooks/commit-msg.sample @@ -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 +} diff --git a/test/examples/revert.git/hooks/post-commit.sample b/test/examples/revert.git/hooks/post-commit.sample new file mode 100755 index 00000000..22668216 --- /dev/null +++ b/test/examples/revert.git/hooks/post-commit.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script that is called after a successful +# commit is made. +# +# To enable this hook, rename this file to "post-commit". + +: Nothing diff --git a/test/examples/revert.git/hooks/post-receive.sample b/test/examples/revert.git/hooks/post-receive.sample new file mode 100755 index 00000000..7a83e17a --- /dev/null +++ b/test/examples/revert.git/hooks/post-receive.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script for the "post-receive" event. +# +# The "post-receive" script is run after receive-pack has accepted a pack +# and the repository has been updated. It is passed arguments in through +# stdin in the form +# +# For example: +# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master +# +# see contrib/hooks/ for a sample, or uncomment the next line and +# rename the file to "post-receive". + +#. /usr/share/doc/git-core/contrib/hooks/post-receive-email diff --git a/test/examples/revert.git/hooks/post-update.sample b/test/examples/revert.git/hooks/post-update.sample new file mode 100755 index 00000000..ec17ec19 --- /dev/null +++ b/test/examples/revert.git/hooks/post-update.sample @@ -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 diff --git a/test/examples/revert.git/hooks/pre-applypatch.sample b/test/examples/revert.git/hooks/pre-applypatch.sample new file mode 100755 index 00000000..b1f187c2 --- /dev/null +++ b/test/examples/revert.git/hooks/pre-applypatch.sample @@ -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 +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/test/examples/revert.git/hooks/pre-commit.sample b/test/examples/revert.git/hooks/pre-commit.sample new file mode 100755 index 00000000..b187c4bb --- /dev/null +++ b/test/examples/revert.git/hooks/pre-commit.sample @@ -0,0 +1,46 @@ +#!/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 hooks.allownonascii) + +# 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')" +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 + exit 1 +fi + +exec git diff-index --check --cached $against -- diff --git a/test/examples/revert.git/hooks/pre-rebase.sample b/test/examples/revert.git/hooks/pre-rebase.sample new file mode 100755 index 00000000..9773ed4c --- /dev/null +++ b/test/examples/revert.git/hooks/pre-rebase.sample @@ -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". diff --git a/test/examples/revert.git/hooks/prepare-commit-msg.sample b/test/examples/revert.git/hooks/prepare-commit-msg.sample new file mode 100755 index 00000000..f093a02e --- /dev/null +++ b/test/examples/revert.git/hooks/prepare-commit-msg.sample @@ -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" diff --git a/test/examples/revert.git/hooks/update.sample b/test/examples/revert.git/hooks/update.sample new file mode 100755 index 00000000..71ab04ed --- /dev/null +++ b/test/examples/revert.git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks 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 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "Usage: $0 " >&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 diff --git a/test/examples/revert.git/index b/test/examples/revert.git/index new file mode 100644 index 0000000000000000000000000000000000000000..07167762cc8bf12127cfc4818178fe0e2a7ba3ef GIT binary patch literal 176 zcmZ?q402{*U|<4aUk0wrK$-zY^8v*eg_qrBU}#*zz`*zwC?x{K{0;&elDnjtrZ6ne zc*1DSy!w*#$E^%3j(WK%Al(T4Xy)8QH|Jlq>rRJo1C6CS8AWHt8R{^u|H8 1291848403 -0800 clone: from /Users/rick/p/gollum/test/examples/revert.git diff --git a/test/examples/revert.git/logs/refs/heads/master b/test/examples/revert.git/logs/refs/heads/master new file mode 100644 index 00000000..3a5bcd9e --- /dev/null +++ b/test/examples/revert.git/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 7c45b5f16ff3bae2a0063191ef832701214d4df5 rick 1291848403 -0800 clone: from /Users/rick/p/gollum/test/examples/revert.git diff --git a/test/examples/revert.git/objects/20/2ced67cea93c7b6bd2928aa1daef8d1d55a20d b/test/examples/revert.git/objects/20/2ced67cea93c7b6bd2928aa1daef8d1d55a20d new file mode 100644 index 0000000000000000000000000000000000000000..d98eb1e7971ae58f56ee823c77199949cc00f138 GIT binary patch literal 146 zcmV;D0B!$xoR!Y)3BoWC08oEtiY!pM%XdJ;RW8?y4cbOR#PtO?aDWGo`@XlS4TRGi zBHE?oIM%{3WsBY+#7ba7ByUajMHo1fkb2ROW9rDx7hf^dY72=WfM7AB)MQNrH0V~h zRrRJo1C6CS8AWHt z8R{^u|H8O?>ZzYRm*+<~zPi|brdfQm-*bb~lZ?v^XFUDXvC85`&9oyi9Xs5MrQRLy z-_`!{`$}NZVgoE5dVqKjB+QtFfW<*R5Ch8`CU>CN5+FMQsO~b5zvS1%A1lu}Zc&n* k^3+?TZovsT|BRJ9pJ&Yx>=kh1iO7-hne*z#pPe!60PX#)C;$Ke literal 0 HcmV?d00001 diff --git a/test/examples/revert.git/objects/pack/pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.pack b/test/examples/revert.git/objects/pack/pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.pack new file mode 100644 index 0000000000000000000000000000000000000000..9741faf84b1f2edfa221e7d28d2de6c1d7904929 GIT binary patch literal 948 zcmWG=boORoU|<4bo~gVQbEcjSb=|so95>yHWnnft?pDZm=lce36uAe@&`;(ZT^Wu$$L(f$V4SA z>3c4^Zt*`^e8%{A3ttnvu(71IE7!TC8Lhm^oGY7mZCN;XqlgWYV(ZKUMRS@|{rFB) z&uK8S+~B|Zh4Hn$uj76!&3CTI{T;qUv{Gm4sj{bg@0mulJXu`4LSIdCvESNMo}bq9 zHa}haK_mC#`{q@@7_Zbh7eK-*78G6#55VD-ekD+Gk*$M32~+*Cu&i?Do^|)*7GCGy zcX8&@^&D4cI=N;l2?shFy@+64owa}`qNHioQR}j}_BAt4yh^xO%(dlti{{jjwWa5N zpR!|O>54pZe#Uma>eK#}Qgfb{{x(|QtKYA>?Yd$9=}0EF563bUDg)v)H@?1f?7{xU zJMJ%AJ?992?GbyqXs`@rzYZ>+ zd~;gMlN;7GZl^kp#NsyYx-P{O_|?$y(3{6eufn$*z7_d(W42Ll?VlODKRmv>>P@)R z+q}C$GHq`d-?9oEkh$eD)!$t?Hsn>_zj;AMYZtIo%rQ1GFfcX@EVy#oH?ctA#)Lbn zXH8lYD~}1gWk0(*eTjXZY0C-g#wY(ncfTv)FuxG7YjR*o+MI=akALa+Fw{1SGTK+n z`TXTG&&QH44gFGj54+)m0cf@S0xHutj$HKs;MHj5o zzhz9l+Q!huE@onZu#|~`E0jqT-P9Yu-|afOOX4wW@Z2TL?>(Nb5uTy<ll*yc9%wB!3ZHy4M7Ni#9rn*f@Cvyu< gGBX_AE3Wfv;*XW*9JeURPI>ArQn%oQoPWkj0K~n+UH||9 literal 0 HcmV?d00001 diff --git a/test/examples/revert.git/packed-refs b/test/examples/revert.git/packed-refs new file mode 100644 index 00000000..76aa95e8 --- /dev/null +++ b/test/examples/revert.git/packed-refs @@ -0,0 +1,3 @@ +# pack-refs with: peeled +7c45b5f16ff3bae2a0063191ef832701214d4df5 refs/heads/master +7c45b5f16ff3bae2a0063191ef832701214d4df5 refs/remotes/origin/master diff --git a/test/examples/revert.git/refs/remotes/origin/HEAD b/test/examples/revert.git/refs/remotes/origin/HEAD new file mode 100644 index 00000000..6efe28ff --- /dev/null +++ b/test/examples/revert.git/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/test/helper.rb b/test/helper.rb index f6e01ded..a5bb1d4b 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -18,6 +18,16 @@ def testpath(path) File.join(TEST_DIR, path) end +def cloned_testpath(path) + path = testpath(path) + cloned = path.chomp('.git') + FileUtils.rm_rf cloned + Dir.chdir(File.expand_path(File.dirname(path))) do + %x{git clone #{File.basename(path)}} + end + cloned +end + def commit_details { :message => "Did something at #{Time.now}", :name => "Tom Preston-Werner", diff --git a/test/test_page.rb b/test/test_page.rb index ed2e7d5b..9fc6fa0a 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -135,3 +135,25 @@ context "Page" do assert_equal '', Gollum::Page.cname(3) end end + +context "Page Reverting" do + setup do + @wiki = Gollum::Wiki.new(cloned_testpath("examples/revert.git")) + end + + test "reverts single commit" do + page1 = @wiki.page('B') + sha = @wiki.revert_page(page1, '7c45b5f16ff3bae2a0063191ef832701214d4df5') + page2 = @wiki.page('B') + assert_equal sha, page2.version.sha + assert_equal "INITIAL", page2.raw_data.strip + end + + test "reverts multiple commits" do + page1 = @wiki.page('A') + sha = @wiki.revert_page(page1, '302a5491a9a5ba12c7652ac831a44961afa312d2^', 'b26b791cb7917c4f37dd9cb4d1e0efb24ac4d26f') + page2 = @wiki.page('A') + assert_equal sha, page2.version.sha + assert_equal "INITIAL", page2.raw_data.strip + end +end From 057baac3ce0dd69018af62a9ed349f166c0f6a32 Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 8 Dec 2010 15:03:21 -0800 Subject: [PATCH 4/9] rm cloned git paths --- test/test_page.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/test_page.rb b/test/test_page.rb index 9fc6fa0a..0502215b 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -138,7 +138,12 @@ end context "Page Reverting" do setup do - @wiki = Gollum::Wiki.new(cloned_testpath("examples/revert.git")) + @path = cloned_testpath("examples/revert.git") + @wiki = Gollum::Wiki.new(@path) + end + + teardown do + FileUtils.rm_rf @path end test "reverts single commit" do From 074b2119fa493165954816b26bf411d25c286d82 Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 8 Dec 2010 15:17:18 -0800 Subject: [PATCH 5/9] use a temp GIT_INDEX_FILE when working with the real git index (during reverts) --- lib/gollum/wiki.rb | 12 +++++++++++- test/helper.rb | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index 6aa227ea..ccd9d779 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -557,10 +557,20 @@ module Gollum end def write_to_real_index(head_sha) + old_index = ENV['GIT_INDEX_FILE'] + temp_index = @repo.git.create_tempfile('index', :clean) + ENV['GIT_INDEX_FILE'] = temp_index @repo.git.native('read-tree', {}, head_sha) if yield - @repo.git.native('write-tree') + tree_sha = @repo.git.native('write-tree') + after_index = ENV['GIT_INDEX_FILE'] + if after_index != temp_index + raise 'environment was changed for the git call' + end + tree_sha end + ensure + ENV['GIT_INDEX_FILE'] = old_index end def full_diff_for(page, sha1, sha2 = nil) diff --git a/test/helper.rb b/test/helper.rb index a5bb1d4b..32fc42d6 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -30,8 +30,8 @@ end def commit_details { :message => "Did something at #{Time.now}", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } + :name => "Tom Preston-Werner", + :email => "tom@github.com" } end # test/spec/mini 3 From 9843f4c739a3a5b03c8d29a5059381f40af71045 Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 8 Dec 2010 15:37:22 -0800 Subject: [PATCH 6/9] use grit's #apply_patch method --- lib/gollum/wiki.rb | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index ccd9d779..8eab9f59 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -316,15 +316,10 @@ module Gollum sha2 = nil end - pcommit = @repo.commit('master') + pcommit = @repo.commit('master') + patch = full_diff_for(page, sha1, sha2) commit[:parent] = [pcommit] - commit[:tree] = write_to_real_index(pcommit.sha) do - options = {:reverse => true, :cached => true} - @repo.git.native(:apply, options) do |stdin| - stdin << full_diff_for(page, sha1, sha2) - stdin.close - end - end + commit[:tree] = @repo.git.apply_patch(pcommit.sha, patch) index = nil sha1 = commit_index(commit) { |i| index = i } @@ -556,26 +551,9 @@ module Gollum index.commit(options[:message], options[:parent], actor) end - def write_to_real_index(head_sha) - old_index = ENV['GIT_INDEX_FILE'] - temp_index = @repo.git.create_tempfile('index', :clean) - ENV['GIT_INDEX_FILE'] = temp_index - @repo.git.native('read-tree', {}, head_sha) - if yield - tree_sha = @repo.git.native('write-tree') - after_index = ENV['GIT_INDEX_FILE'] - if after_index != temp_index - raise 'environment was changed for the git call' - end - tree_sha - end - ensure - ENV['GIT_INDEX_FILE'] = old_index - end - def full_diff_for(page, sha1, sha2 = nil) sha1, sha2 = "#{sha1}^", sha1 if sha2.nil? - repo.git.native(:diff, {}, sha1, sha2, '--', page.path) + repo.git.native(:diff, {:R => true}, sha1, sha2, '--', page.path) end # Ensures a commit hash has all the required fields for a commit. From a8f74a7e7cb136eca6b48ea182cc113292f4e10e Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 8 Dec 2010 15:39:41 -0800 Subject: [PATCH 7/9] awkwardly named method --- lib/gollum/wiki.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index 8eab9f59..309aebcf 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -317,7 +317,7 @@ module Gollum end pcommit = @repo.commit('master') - patch = full_diff_for(page, sha1, sha2) + patch = full_reverse_diff_for(page, sha1, sha2) commit[:parent] = [pcommit] commit[:tree] = @repo.git.apply_patch(pcommit.sha, patch) @@ -551,7 +551,7 @@ module Gollum index.commit(options[:message], options[:parent], actor) end - def full_diff_for(page, sha1, sha2 = nil) + def full_reverse_diff_for(page, sha1, sha2 = nil) sha1, sha2 = "#{sha1}^", sha1 if sha2.nil? repo.git.native(:diff, {:R => true}, sha1, sha2, '--', page.path) end From d436f5f112281d4feafe1f55d41e74ce77d17908 Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 8 Dec 2010 15:40:57 -0800 Subject: [PATCH 8/9] cleanliness is next to godliness --- .../lotr.git/hooks/applypatch-msg.sample | 15 -- .../examples/lotr.git/hooks/commit-msg.sample | 24 --- .../lotr.git/hooks/post-commit.sample | 8 - .../lotr.git/hooks/post-receive.sample | 15 -- .../lotr.git/hooks/post-update.sample | 8 - .../lotr.git/hooks/pre-applypatch.sample | 14 -- .../examples/lotr.git/hooks/pre-commit.sample | 46 ----- .../examples/lotr.git/hooks/pre-rebase.sample | 169 ------------------ .../lotr.git/hooks/prepare-commit-msg.sample | 36 ---- test/examples/lotr.git/hooks/update.sample | 128 ------------- .../revert.git/hooks/applypatch-msg.sample | 15 -- .../revert.git/hooks/commit-msg.sample | 24 --- .../revert.git/hooks/post-commit.sample | 8 - .../revert.git/hooks/post-receive.sample | 15 -- .../revert.git/hooks/post-update.sample | 8 - .../revert.git/hooks/pre-applypatch.sample | 14 -- .../revert.git/hooks/pre-commit.sample | 46 ----- .../revert.git/hooks/pre-rebase.sample | 169 ------------------ .../hooks/prepare-commit-msg.sample | 36 ---- test/examples/revert.git/hooks/update.sample | 128 ------------- .../yubiwa.git/hooks/applypatch-msg.sample | 15 -- .../yubiwa.git/hooks/commit-msg.sample | 24 --- .../yubiwa.git/hooks/post-commit.sample | 8 - .../yubiwa.git/hooks/post-receive.sample | 15 -- .../yubiwa.git/hooks/post-update.sample | 8 - .../yubiwa.git/hooks/pre-applypatch.sample | 14 -- .../yubiwa.git/hooks/pre-commit.sample | 46 ----- .../yubiwa.git/hooks/pre-rebase.sample | 169 ------------------ .../hooks/prepare-commit-msg.sample | 36 ---- test/examples/yubiwa.git/hooks/update.sample | 128 ------------- 30 files changed, 1389 deletions(-) delete mode 100755 test/examples/lotr.git/hooks/applypatch-msg.sample delete mode 100755 test/examples/lotr.git/hooks/commit-msg.sample delete mode 100755 test/examples/lotr.git/hooks/post-commit.sample delete mode 100755 test/examples/lotr.git/hooks/post-receive.sample delete mode 100755 test/examples/lotr.git/hooks/post-update.sample delete mode 100755 test/examples/lotr.git/hooks/pre-applypatch.sample delete mode 100755 test/examples/lotr.git/hooks/pre-commit.sample delete mode 100755 test/examples/lotr.git/hooks/pre-rebase.sample delete mode 100755 test/examples/lotr.git/hooks/prepare-commit-msg.sample delete mode 100755 test/examples/lotr.git/hooks/update.sample delete mode 100755 test/examples/revert.git/hooks/applypatch-msg.sample delete mode 100755 test/examples/revert.git/hooks/commit-msg.sample delete mode 100755 test/examples/revert.git/hooks/post-commit.sample delete mode 100755 test/examples/revert.git/hooks/post-receive.sample delete mode 100755 test/examples/revert.git/hooks/post-update.sample delete mode 100755 test/examples/revert.git/hooks/pre-applypatch.sample delete mode 100755 test/examples/revert.git/hooks/pre-commit.sample delete mode 100755 test/examples/revert.git/hooks/pre-rebase.sample delete mode 100755 test/examples/revert.git/hooks/prepare-commit-msg.sample delete mode 100755 test/examples/revert.git/hooks/update.sample delete mode 100755 test/examples/yubiwa.git/hooks/applypatch-msg.sample delete mode 100755 test/examples/yubiwa.git/hooks/commit-msg.sample delete mode 100755 test/examples/yubiwa.git/hooks/post-commit.sample delete mode 100755 test/examples/yubiwa.git/hooks/post-receive.sample delete mode 100755 test/examples/yubiwa.git/hooks/post-update.sample delete mode 100755 test/examples/yubiwa.git/hooks/pre-applypatch.sample delete mode 100755 test/examples/yubiwa.git/hooks/pre-commit.sample delete mode 100755 test/examples/yubiwa.git/hooks/pre-rebase.sample delete mode 100755 test/examples/yubiwa.git/hooks/prepare-commit-msg.sample delete mode 100755 test/examples/yubiwa.git/hooks/update.sample diff --git a/test/examples/lotr.git/hooks/applypatch-msg.sample b/test/examples/lotr.git/hooks/applypatch-msg.sample deleted file mode 100755 index 8b2a2fe8..00000000 --- a/test/examples/lotr.git/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/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 -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -: diff --git a/test/examples/lotr.git/hooks/commit-msg.sample b/test/examples/lotr.git/hooks/commit-msg.sample deleted file mode 100755 index b58d1184..00000000 --- a/test/examples/lotr.git/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 -} diff --git a/test/examples/lotr.git/hooks/post-commit.sample b/test/examples/lotr.git/hooks/post-commit.sample deleted file mode 100755 index 22668216..00000000 --- a/test/examples/lotr.git/hooks/post-commit.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script that is called after a successful -# commit is made. -# -# To enable this hook, rename this file to "post-commit". - -: Nothing diff --git a/test/examples/lotr.git/hooks/post-receive.sample b/test/examples/lotr.git/hooks/post-receive.sample deleted file mode 100755 index 7a83e17a..00000000 --- a/test/examples/lotr.git/hooks/post-receive.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script for the "post-receive" event. -# -# The "post-receive" script is run after receive-pack has accepted a pack -# and the repository has been updated. It is passed arguments in through -# stdin in the form -# -# For example: -# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master -# -# see contrib/hooks/ for a sample, or uncomment the next line and -# rename the file to "post-receive". - -#. /usr/share/doc/git-core/contrib/hooks/post-receive-email diff --git a/test/examples/lotr.git/hooks/post-update.sample b/test/examples/lotr.git/hooks/post-update.sample deleted file mode 100755 index ec17ec19..00000000 --- a/test/examples/lotr.git/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 diff --git a/test/examples/lotr.git/hooks/pre-applypatch.sample b/test/examples/lotr.git/hooks/pre-applypatch.sample deleted file mode 100755 index b1f187c2..00000000 --- a/test/examples/lotr.git/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -: diff --git a/test/examples/lotr.git/hooks/pre-commit.sample b/test/examples/lotr.git/hooks/pre-commit.sample deleted file mode 100755 index b187c4bb..00000000 --- a/test/examples/lotr.git/hooks/pre-commit.sample +++ /dev/null @@ -1,46 +0,0 @@ -#!/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 hooks.allownonascii) - -# 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')" -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 - exit 1 -fi - -exec git diff-index --check --cached $against -- diff --git a/test/examples/lotr.git/hooks/pre-rebase.sample b/test/examples/lotr.git/hooks/pre-rebase.sample deleted file mode 100755 index 9773ed4c..00000000 --- a/test/examples/lotr.git/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/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". diff --git a/test/examples/lotr.git/hooks/prepare-commit-msg.sample b/test/examples/lotr.git/hooks/prepare-commit-msg.sample deleted file mode 100755 index f093a02e..00000000 --- a/test/examples/lotr.git/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,36 +0,0 @@ -#!/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" diff --git a/test/examples/lotr.git/hooks/update.sample b/test/examples/lotr.git/hooks/update.sample deleted file mode 100755 index 71ab04ed..00000000 --- a/test/examples/lotr.git/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to blocks 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 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "Usage: $0 " >&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 diff --git a/test/examples/revert.git/hooks/applypatch-msg.sample b/test/examples/revert.git/hooks/applypatch-msg.sample deleted file mode 100755 index 8b2a2fe8..00000000 --- a/test/examples/revert.git/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/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 -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -: diff --git a/test/examples/revert.git/hooks/commit-msg.sample b/test/examples/revert.git/hooks/commit-msg.sample deleted file mode 100755 index b58d1184..00000000 --- a/test/examples/revert.git/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 -} diff --git a/test/examples/revert.git/hooks/post-commit.sample b/test/examples/revert.git/hooks/post-commit.sample deleted file mode 100755 index 22668216..00000000 --- a/test/examples/revert.git/hooks/post-commit.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script that is called after a successful -# commit is made. -# -# To enable this hook, rename this file to "post-commit". - -: Nothing diff --git a/test/examples/revert.git/hooks/post-receive.sample b/test/examples/revert.git/hooks/post-receive.sample deleted file mode 100755 index 7a83e17a..00000000 --- a/test/examples/revert.git/hooks/post-receive.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script for the "post-receive" event. -# -# The "post-receive" script is run after receive-pack has accepted a pack -# and the repository has been updated. It is passed arguments in through -# stdin in the form -# -# For example: -# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master -# -# see contrib/hooks/ for a sample, or uncomment the next line and -# rename the file to "post-receive". - -#. /usr/share/doc/git-core/contrib/hooks/post-receive-email diff --git a/test/examples/revert.git/hooks/post-update.sample b/test/examples/revert.git/hooks/post-update.sample deleted file mode 100755 index ec17ec19..00000000 --- a/test/examples/revert.git/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 diff --git a/test/examples/revert.git/hooks/pre-applypatch.sample b/test/examples/revert.git/hooks/pre-applypatch.sample deleted file mode 100755 index b1f187c2..00000000 --- a/test/examples/revert.git/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -: diff --git a/test/examples/revert.git/hooks/pre-commit.sample b/test/examples/revert.git/hooks/pre-commit.sample deleted file mode 100755 index b187c4bb..00000000 --- a/test/examples/revert.git/hooks/pre-commit.sample +++ /dev/null @@ -1,46 +0,0 @@ -#!/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 hooks.allownonascii) - -# 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')" -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 - exit 1 -fi - -exec git diff-index --check --cached $against -- diff --git a/test/examples/revert.git/hooks/pre-rebase.sample b/test/examples/revert.git/hooks/pre-rebase.sample deleted file mode 100755 index 9773ed4c..00000000 --- a/test/examples/revert.git/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/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". diff --git a/test/examples/revert.git/hooks/prepare-commit-msg.sample b/test/examples/revert.git/hooks/prepare-commit-msg.sample deleted file mode 100755 index f093a02e..00000000 --- a/test/examples/revert.git/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,36 +0,0 @@ -#!/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" diff --git a/test/examples/revert.git/hooks/update.sample b/test/examples/revert.git/hooks/update.sample deleted file mode 100755 index 71ab04ed..00000000 --- a/test/examples/revert.git/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to blocks 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 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "Usage: $0 " >&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 diff --git a/test/examples/yubiwa.git/hooks/applypatch-msg.sample b/test/examples/yubiwa.git/hooks/applypatch-msg.sample deleted file mode 100755 index 8b2a2fe8..00000000 --- a/test/examples/yubiwa.git/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/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 -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -: diff --git a/test/examples/yubiwa.git/hooks/commit-msg.sample b/test/examples/yubiwa.git/hooks/commit-msg.sample deleted file mode 100755 index 6ef1d29d..00000000 --- a/test/examples/yubiwa.git/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 -} diff --git a/test/examples/yubiwa.git/hooks/post-commit.sample b/test/examples/yubiwa.git/hooks/post-commit.sample deleted file mode 100755 index 22668216..00000000 --- a/test/examples/yubiwa.git/hooks/post-commit.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script that is called after a successful -# commit is made. -# -# To enable this hook, rename this file to "post-commit". - -: Nothing diff --git a/test/examples/yubiwa.git/hooks/post-receive.sample b/test/examples/yubiwa.git/hooks/post-receive.sample deleted file mode 100755 index 7a83e17a..00000000 --- a/test/examples/yubiwa.git/hooks/post-receive.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script for the "post-receive" event. -# -# The "post-receive" script is run after receive-pack has accepted a pack -# and the repository has been updated. It is passed arguments in through -# stdin in the form -# -# For example: -# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master -# -# see contrib/hooks/ for a sample, or uncomment the next line and -# rename the file to "post-receive". - -#. /usr/share/doc/git-core/contrib/hooks/post-receive-email diff --git a/test/examples/yubiwa.git/hooks/post-update.sample b/test/examples/yubiwa.git/hooks/post-update.sample deleted file mode 100755 index 5323b56b..00000000 --- a/test/examples/yubiwa.git/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 diff --git a/test/examples/yubiwa.git/hooks/pre-applypatch.sample b/test/examples/yubiwa.git/hooks/pre-applypatch.sample deleted file mode 100755 index b1f187c2..00000000 --- a/test/examples/yubiwa.git/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -: diff --git a/test/examples/yubiwa.git/hooks/pre-commit.sample b/test/examples/yubiwa.git/hooks/pre-commit.sample deleted file mode 100755 index 439eefda..00000000 --- a/test/examples/yubiwa.git/hooks/pre-commit.sample +++ /dev/null @@ -1,46 +0,0 @@ -#!/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 hooks.allownonascii) - -# 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')" -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 - exit 1 -fi - -exec git diff-index --check --cached $against -- diff --git a/test/examples/yubiwa.git/hooks/pre-rebase.sample b/test/examples/yubiwa.git/hooks/pre-rebase.sample deleted file mode 100755 index be1b06e2..00000000 --- a/test/examples/yubiwa.git/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/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"` - 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". diff --git a/test/examples/yubiwa.git/hooks/prepare-commit-msg.sample b/test/examples/yubiwa.git/hooks/prepare-commit-msg.sample deleted file mode 100755 index 36524249..00000000 --- a/test/examples/yubiwa.git/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,36 +0,0 @@ -#!/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,) - perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; - -# ,|template,) -# 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" diff --git a/test/examples/yubiwa.git/hooks/update.sample b/test/examples/yubiwa.git/hooks/update.sample deleted file mode 100755 index fd63b2d6..00000000 --- a/test/examples/yubiwa.git/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to blocks 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 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "Usage: $0 " >&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 From e2fbac96cb362db54e703a035b9ba1c3e4482bae Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 8 Dec 2010 15:55:35 -0800 Subject: [PATCH 9/9] sometimes reverts fail, yo --- lib/gollum/wiki.rb | 1 + test/test_page.rb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index 309aebcf..11a20923 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -320,6 +320,7 @@ module Gollum patch = full_reverse_diff_for(page, sha1, sha2) commit[:parent] = [pcommit] commit[:tree] = @repo.git.apply_patch(pcommit.sha, patch) + return false unless commit[:tree] index = nil sha1 = commit_index(commit) { |i| index = i } diff --git a/test/test_page.rb b/test/test_page.rb index 0502215b..87ba3a89 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -161,4 +161,9 @@ context "Page Reverting" do assert_equal sha, page2.version.sha assert_equal "INITIAL", page2.raw_data.strip end + + test "cannot revert conflicting commit" do + page1 = @wiki.page('A') + assert_equal false, @wiki.revert_page(page1, '302a5491a9a5ba12c7652ac831a44961afa312d2') + end end