From e6fda8328908986405f381654e55227ca090b6ea Mon Sep 17 00:00:00 2001
From: Gary Rennie <webmaster@gazler.com>
Date: Sun, 6 May 2012 12:35:53 +0100
Subject: [PATCH] fix for cherry-pick level

Because of the way init_from_level works with the .githug folder

Combined with having a README.md in the folder and the root

A stash is required
---
 levels/cherry-pick.rb                           |   1 +
 .../.githug/hooks/applypatch-msg.sample         |   0
 .../cherry-pick/.githug/hooks/commit-msg.sample |   0
 .../.githug/hooks/post-update.sample            |   0
 .../.githug/hooks/pre-applypatch.sample         |   0
 .../cherry-pick/.githug/hooks/pre-commit.sample |   0
 .../cherry-pick/.githug/hooks/pre-rebase.sample |   0
 .../.githug/hooks/prepare-commit-msg.sample     |   0
 levels/cherry-pick/.githug/hooks/update.sample  |   0
 levels/cherry-pick/.githug/index                | Bin 256 -> 256 bytes
 10 files changed, 1 insertion(+)
 mode change 100755 => 100644 levels/cherry-pick/.githug/hooks/applypatch-msg.sample
 mode change 100755 => 100644 levels/cherry-pick/.githug/hooks/commit-msg.sample
 mode change 100755 => 100644 levels/cherry-pick/.githug/hooks/post-update.sample
 mode change 100755 => 100644 levels/cherry-pick/.githug/hooks/pre-applypatch.sample
 mode change 100755 => 100644 levels/cherry-pick/.githug/hooks/pre-commit.sample
 mode change 100755 => 100644 levels/cherry-pick/.githug/hooks/pre-rebase.sample
 mode change 100755 => 100644 levels/cherry-pick/.githug/hooks/prepare-commit-msg.sample
 mode change 100755 => 100644 levels/cherry-pick/.githug/hooks/update.sample

diff --git a/levels/cherry-pick.rb b/levels/cherry-pick.rb
index 3f361a9d..005880e5 100644
--- a/levels/cherry-pick.rb
+++ b/levels/cherry-pick.rb
@@ -3,6 +3,7 @@
 
 setup do
     init_from_level
+    `git stash` #fix for README.md being in githug root an the level
 end
 
 solution do
diff --git a/levels/cherry-pick/.githug/hooks/applypatch-msg.sample b/levels/cherry-pick/.githug/hooks/applypatch-msg.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/commit-msg.sample b/levels/cherry-pick/.githug/hooks/commit-msg.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/post-update.sample b/levels/cherry-pick/.githug/hooks/post-update.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/pre-applypatch.sample b/levels/cherry-pick/.githug/hooks/pre-applypatch.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/pre-commit.sample b/levels/cherry-pick/.githug/hooks/pre-commit.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/pre-rebase.sample b/levels/cherry-pick/.githug/hooks/pre-rebase.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/prepare-commit-msg.sample b/levels/cherry-pick/.githug/hooks/prepare-commit-msg.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/update.sample b/levels/cherry-pick/.githug/hooks/update.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/index b/levels/cherry-pick/.githug/index
index d4dc9e76a8441600771b8f3e9fe0e8b4cf6b3182..6faf233ad5c1913b6c7c0872bde734741e8ba6d4 100644
GIT binary patch
delta 155
zcmZo*YG5*O@eFciU|?VZVrKsZ_Sb<l1B_;1;NW0zTwBM$(6|IB{Q`t18mKB`SJs50
mtU?#NvULkll$}r!xp21LcH!P)?dviZ7v+?PKdAq|%n|^$3M!5O

delta 155
zcmZo*YG5*O@eFciU|?VZVrKs$hn+y00Y>uy#hI*jNir}rE@5C`{0fv3nP{M@j9r-&
min0n_9Ll6ol$}r!*>daTYpFhg>Q`%ST{s|^ICb(;lX3tmsU=we