whiskey_disk 0.6.11 → 0.6.12

data/CHANGELOG

@@ -1,4 +1,12 @@
 
+0.6.12 / 2011-02-20 
+==================
+
+  * bad Rakefile should cause deployment to fail
+  * post_* rake task specs
+  * new scenarios to use when testing post_* rake hooks
+  * adding a dump_log helper to use when developing integration specs
+
 0.6.11 / 2011-02-18 
 ==================
 

data/README.markdown

@@ -767,7 +767,8 @@ to see what we have in mind for the near future.
 ### Contributors ###
 
  - Rick Bradley (rick@rickbradley.com, github:rick)
- - Alex Sharp (ajsharp@gmail.com) - issues, real-world usage cases, design feedback
  - Jeremy Holland (jeremy@jeremypholland.com, github:therubyneck): feature/bugfix contributions
  - Kevin Barnes (@vinbarnes), Yossef Mendellsohn (cardioid) for design help and proofreading
+ - Alex Sharp (ajsharp@gmail.com) - issues, real-world usage cases, design feedback
+ - Josh Moore (josh@codingforrent.com) - tracking down issues handling bad project Rakefiles
  - Cristi Balan (evilchelu) for feedback and proofreading

data/Rakefile

@@ -20,6 +20,10 @@ begin
     gemspec.homepage = "http://github.com/flogic/whiskey_disk"
     gemspec.authors = ["Rick Bradley"]
     gemspec.add_dependency('rake')
+    
+    # I've decided that the integration spec shizzle shouldn't go into the gem
+    gemspec.files.exclude 'scenarios', 'spec/integration'
+    gemspec.test_files.exclude 'scenarios', 'spec/integration'
   end
   Jeweler::GemcutterTasks.new  
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.6.11
+0.6.12

data/lib/whiskey_disk.rb

@@ -187,7 +187,7 @@ class WhiskeyDisk
     end
     
     def if_task_defined(task, cmd)
-      %Q{if [[ `#{env_vars} rake -P | grep #{task}` != "" ]]; then #{cmd}; fi}
+      %Q(rakep=`#{env_vars} rake -P` && if [[ `echo "${rakep}" | grep #{task}` != "" ]]; then #{cmd}; fi )
     end
     
     def clone_repository(repo, path)

data/spec/spec_helper.rb

@@ -59,4 +59,8 @@ end
 
 def deployed_file(path)
   File.join(deployment_root, path)
+end
+
+def dump_log
+  STDERR.puts("\n\n\n" + File.read(integration_log) + "\n\n\n")
 end

data/spec/whiskey_disk_spec.rb

@@ -447,7 +447,7 @@ describe 'WhiskeyDisk' do
     
     it 'should make the post setup rake tasks conditional on the deploy:post_setup rake task being defined' do
       WhiskeyDisk.run_post_setup_hooks
-      WhiskeyDisk.buffer.join(' ').should.match(%r{if \[\[ \`rake -P | grep deploy:post_setup\` != "" \]\]; })      
+      WhiskeyDisk.buffer.join(' ').should.match(%r{rakep=\`.*rake -P\` && if \[\[ \`echo "\$\{rakep\}" | grep deploy:post_setup\` != "" \]\];})      
     end
 
     it 'should ensure that any rake ENV variable are set when checking for deploy:post_setup tasks' do
@@ -555,7 +555,7 @@ describe 'WhiskeyDisk' do
     
     it 'should make the post deployment rake tasks conditional on the deploy:post_deploy rake task being defined' do
       WhiskeyDisk.run_post_deploy_hooks
-      WhiskeyDisk.buffer.join(' ').should.match(%r{if \[\[ \`rake -P | grep deploy:post_deploy\` != "" \]\]; })      
+      WhiskeyDisk.buffer.join(' ').should.match(%r{rakep=\`.*rake -P\` && if \[\[ \`echo "\$\{rakep\}" | grep deploy:post_deploy\` != "" \]\];})      
     end
 
     it 'should ensure that any rake ENV variable are set when checking for deploy:post_setup tasks' do

data/whiskey_disk.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.6.11"
+  s.version = "0.6.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]
@@ -39,58 +39,9 @@ Gem::Specification.new do |s|
     "lib/whiskey_disk/config.rb",
     "lib/whiskey_disk/helpers.rb",
     "lib/whiskey_disk/rake.rb",
-    "scenarios/git_repositories/config.git/HEAD",
-    "scenarios/git_repositories/config.git/config",
-    "scenarios/git_repositories/config.git/description",
-    "scenarios/git_repositories/config.git/git-daemon-export-ok",
-    "scenarios/git_repositories/config.git/hooks/applypatch-msg.sample",
-    "scenarios/git_repositories/config.git/hooks/commit-msg.sample",
-    "scenarios/git_repositories/config.git/hooks/post-commit.sample",
-    "scenarios/git_repositories/config.git/hooks/post-receive.sample",
-    "scenarios/git_repositories/config.git/hooks/post-update.sample",
-    "scenarios/git_repositories/config.git/hooks/pre-applypatch.sample",
-    "scenarios/git_repositories/config.git/hooks/pre-commit.sample",
-    "scenarios/git_repositories/config.git/hooks/pre-rebase.sample",
-    "scenarios/git_repositories/config.git/hooks/prepare-commit-msg.sample",
-    "scenarios/git_repositories/config.git/hooks/update.sample",
-    "scenarios/git_repositories/config.git/info/exclude",
-    "scenarios/git_repositories/config.git/objects/17/6bf54cf17d1d1c24556dc059c4144a5df230e8",
-    "scenarios/git_repositories/config.git/objects/20/e9ff3feaa8ede30f707e5f1b4356e3c02bb7ec",
-    "scenarios/git_repositories/config.git/objects/45/117b1c775f0de415478dbf08ed9d667ab17d13",
-    "scenarios/git_repositories/config.git/objects/71/eb5df52676e8e6efba471050b46978173af110",
-    "scenarios/git_repositories/config.git/objects/d1/0bcd51fec41f854001e4d61f99d9e282a695d3",
-    "scenarios/git_repositories/config.git/objects/e6/b02c66ad632e6b8535c4630cb8fe07732a72fc",
-    "scenarios/git_repositories/config.git/objects/f9/49d5d8a4f12c91471e34d4e277239c35ebd10d",
-    "scenarios/git_repositories/config.git/refs/heads/master",
-    "scenarios/git_repositories/project.git/HEAD",
-    "scenarios/git_repositories/project.git/config",
-    "scenarios/git_repositories/project.git/description",
-    "scenarios/git_repositories/project.git/git-daemon-export-ok",
-    "scenarios/git_repositories/project.git/hooks/applypatch-msg.sample",
-    "scenarios/git_repositories/project.git/hooks/commit-msg.sample",
-    "scenarios/git_repositories/project.git/hooks/post-commit.sample",
-    "scenarios/git_repositories/project.git/hooks/post-receive.sample",
-    "scenarios/git_repositories/project.git/hooks/post-update.sample",
-    "scenarios/git_repositories/project.git/hooks/pre-applypatch.sample",
-    "scenarios/git_repositories/project.git/hooks/pre-commit.sample",
-    "scenarios/git_repositories/project.git/hooks/pre-rebase.sample",
-    "scenarios/git_repositories/project.git/hooks/prepare-commit-msg.sample",
-    "scenarios/git_repositories/project.git/hooks/update.sample",
-    "scenarios/git_repositories/project.git/info/exclude",
-    "scenarios/git_repositories/project.git/objects/20/1c7641c2e42b0b904e5c1f793489d8b858e4da",
-    "scenarios/git_repositories/project.git/objects/80/26076649ceccbe96a6292f2432652f08483035",
-    "scenarios/git_repositories/project.git/objects/ef/2a88894d5421920b9dfe67a9a4d8043830e62e",
-    "scenarios/git_repositories/project.git/refs/heads/master",
-    "scenarios/invalid/deploy.yml",
-    "scenarios/local/deploy.yml",
-    "scenarios/remote/deploy.yml",
     "spec/.bacon",
     "spec/init_spec.rb",
     "spec/install_spec.rb",
-    "spec/integration/deployment_failures_spec.rb",
-    "spec/integration/invalid_configuration_spec.rb",
-    "spec/integration/local_deployments_spec.rb",
-    "spec/integration/remote_deployments_spec.rb",
     "spec/spec_helper.rb",
     "spec/wd_command_spec.rb",
     "spec/wd_role_command_spec.rb",
@@ -108,10 +59,6 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/init_spec.rb",
     "spec/install_spec.rb",
-    "spec/integration/deployment_failures_spec.rb",
-    "spec/integration/invalid_configuration_spec.rb",
-    "spec/integration/local_deployments_spec.rb",
-    "spec/integration/remote_deployments_spec.rb",
     "spec/spec_helper.rb",
     "spec/wd_command_spec.rb",
     "spec/wd_role_command_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 6
-  - 11
-  version: 0.6.11
+  - 12
+  version: 0.6.12
 platform: ruby
 authors: 
 - Rick Bradley
@@ -64,58 +64,9 @@ files:
 - lib/whiskey_disk/config.rb
 - lib/whiskey_disk/helpers.rb
 - lib/whiskey_disk/rake.rb
-- scenarios/git_repositories/config.git/HEAD
-- scenarios/git_repositories/config.git/config
-- scenarios/git_repositories/config.git/description
-- scenarios/git_repositories/config.git/git-daemon-export-ok
-- scenarios/git_repositories/config.git/hooks/applypatch-msg.sample
-- scenarios/git_repositories/config.git/hooks/commit-msg.sample
-- scenarios/git_repositories/config.git/hooks/post-commit.sample
-- scenarios/git_repositories/config.git/hooks/post-receive.sample
-- scenarios/git_repositories/config.git/hooks/post-update.sample
-- scenarios/git_repositories/config.git/hooks/pre-applypatch.sample
-- scenarios/git_repositories/config.git/hooks/pre-commit.sample
-- scenarios/git_repositories/config.git/hooks/pre-rebase.sample
-- scenarios/git_repositories/config.git/hooks/prepare-commit-msg.sample
-- scenarios/git_repositories/config.git/hooks/update.sample
-- scenarios/git_repositories/config.git/info/exclude
-- scenarios/git_repositories/config.git/objects/17/6bf54cf17d1d1c24556dc059c4144a5df230e8
-- scenarios/git_repositories/config.git/objects/20/e9ff3feaa8ede30f707e5f1b4356e3c02bb7ec
-- scenarios/git_repositories/config.git/objects/45/117b1c775f0de415478dbf08ed9d667ab17d13
-- scenarios/git_repositories/config.git/objects/71/eb5df52676e8e6efba471050b46978173af110
-- scenarios/git_repositories/config.git/objects/d1/0bcd51fec41f854001e4d61f99d9e282a695d3
-- scenarios/git_repositories/config.git/objects/e6/b02c66ad632e6b8535c4630cb8fe07732a72fc
-- scenarios/git_repositories/config.git/objects/f9/49d5d8a4f12c91471e34d4e277239c35ebd10d
-- scenarios/git_repositories/config.git/refs/heads/master
-- scenarios/git_repositories/project.git/HEAD
-- scenarios/git_repositories/project.git/config
-- scenarios/git_repositories/project.git/description
-- scenarios/git_repositories/project.git/git-daemon-export-ok
-- scenarios/git_repositories/project.git/hooks/applypatch-msg.sample
-- scenarios/git_repositories/project.git/hooks/commit-msg.sample
-- scenarios/git_repositories/project.git/hooks/post-commit.sample
-- scenarios/git_repositories/project.git/hooks/post-receive.sample
-- scenarios/git_repositories/project.git/hooks/post-update.sample
-- scenarios/git_repositories/project.git/hooks/pre-applypatch.sample
-- scenarios/git_repositories/project.git/hooks/pre-commit.sample
-- scenarios/git_repositories/project.git/hooks/pre-rebase.sample
-- scenarios/git_repositories/project.git/hooks/prepare-commit-msg.sample
-- scenarios/git_repositories/project.git/hooks/update.sample
-- scenarios/git_repositories/project.git/info/exclude
-- scenarios/git_repositories/project.git/objects/20/1c7641c2e42b0b904e5c1f793489d8b858e4da
-- scenarios/git_repositories/project.git/objects/80/26076649ceccbe96a6292f2432652f08483035
-- scenarios/git_repositories/project.git/objects/ef/2a88894d5421920b9dfe67a9a4d8043830e62e
-- scenarios/git_repositories/project.git/refs/heads/master
-- scenarios/invalid/deploy.yml
-- scenarios/local/deploy.yml
-- scenarios/remote/deploy.yml
 - spec/.bacon
 - spec/init_spec.rb
 - spec/install_spec.rb
-- spec/integration/deployment_failures_spec.rb
-- spec/integration/invalid_configuration_spec.rb
-- spec/integration/local_deployments_spec.rb
-- spec/integration/remote_deployments_spec.rb
 - spec/spec_helper.rb
 - spec/wd_command_spec.rb
 - spec/wd_role_command_spec.rb
@@ -162,10 +113,6 @@ summary: embarrassingly fast deployments.
 test_files: 
 - spec/init_spec.rb
 - spec/install_spec.rb
-- spec/integration/deployment_failures_spec.rb
-- spec/integration/invalid_configuration_spec.rb
-- spec/integration/local_deployments_spec.rb
-- spec/integration/remote_deployments_spec.rb
 - spec/spec_helper.rb
 - spec/wd_command_spec.rb
 - spec/wd_role_command_spec.rb

data/scenarios/git_repositories/config.git/HEAD

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

data/scenarios/git_repositories/config.git/config

@@ -1,5 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = true
-	ignorecase = true

data/scenarios/git_repositories/config.git/description

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

data/scenarios/git_repositories/config.git/hooks/applypatch-msg.sample

@@ -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+"$@"}
-:

data/scenarios/git_repositories/config.git/hooks/commit-msg.sample

@@ -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
-}

data/scenarios/git_repositories/config.git/hooks/post-commit.sample

@@ -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

data/scenarios/git_repositories/config.git/hooks/post-receive.sample

@@ -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
-#  <oldrev> <newrev> <refname>
-# 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

data/scenarios/git_repositories/config.git/hooks/post-update.sample

@@ -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

data/scenarios/git_repositories/config.git/hooks/pre-applypatch.sample

@@ -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+"$@"}
-:

data/scenarios/git_repositories/config.git/hooks/pre-commit.sample

@@ -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 --

data/scenarios/git_repositories/config.git/hooks/pre-rebase.sample

@@ -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".

data/scenarios/git_repositories/config.git/hooks/prepare-commit-msg.sample

@@ -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"