prep stage 10

Author: ShayNehmad

.gitignore

@@ -106,3 +106,8 @@ venv.bak/
 # editors
 .vscode/
 .idea/
+
+# vim swp files
+*.swp
+*.swo
+

.travis/runme.sh

@@ -43,52 +43,19 @@ function echo_parents_amount {
 
 printaline
 
-# Check if the script itself ran successfully.
-python ENCOM/login.py CLU
-login_exit_code=$?
-if [ $login_exit_code -ne 0 ];
-then bad "Login failed...";
-fi
-
-echo "Fetching tags..."
-git fetch --tags
-
-flamenco_commit_hash=$( echo_tag_commit_hash flamenco-wens-violer-tag )
+ls add_files_here -1
 
-parent_1=$( git log -1 | head -2 | tail -1 | awk '{ print $2 }' )
-parent_2=$( git log -1 | head -2 | tail -1 | awk '{ print $3 }' )
+how_many_files=$(ls add_files_here -1 | wc -l)
 
-echo "Let's look at the log..."
-git log --oneline --graph -n 10 --decorate
-
-echo "parent 1 hash: " $parent_1
-echo "parent 2 hash: " $parent_2
-
-# which parent is the user's commit? 
-users_commit_hash=""
-if [[ $parent_1 = $flamenco_commit_hash ]] # parent1 is NOT the user's commit
-then users_commit_hash=$parent_2
-else users_commit_hash=$parent_1
+if [ $how_many_files -lt 99 ]; 
+    then bad "Not enough files: only "$how_many_files", need more than 99"
 fi
 
-echo "User's commit was ${users_commit_hash}"
-
-distance_to_flamenco=$( git rev-list --count ${flamenco_commit_hash}..${users_commit_hash} )
-
-echo "Distance to flamenco: ${distance_to_flamenco}"
-
-if [[ distance_to_flamenco -ne 1 ]]
-then
-    bad "Should solve this using only one commit!"
+# Check how many commits the user needed - shouldn't be more than 3 be two (the user commit + merge commit)!
+commit_amount=$( git log premove-refile-misnomer-tag.. --oneline | wc -l )
+if [ $commit_amount -gt 3 ];
+    then bad "Too many commits! Took "$commit_amount" commits";
 fi
 
-echo "Trying to find v1.0.1104001 tag..."
-rinz_ver_commit_hash=$( echo_tag_commit_hash v1.0.1104001 )
-if [[ $rinz_ver_commit_hash != $users_commit_hash ]]
-then
-    bad "Didn't find version tag!"
-fi
-printaline
-
-flag "premove-refile-misnomer"
+flag "shill-foe-pickler"
 exit 0

README.md

@@ -76,15 +76,9 @@ For how to use a specific command you always have `git help`. For a good explana
 
 ### Stage 10
 
-![HarderBetterFasterStronger](https://media.giphy.com/media/qTmjKxXDwvK7K/giphy.gif)
+**For this stage, you must run the script `setup_stage_10.sh` first!**
 
-You win!
-
-![you win](https://media.giphy.com/media/POH5k3dYNLrqa7SbVa/giphy.gif)
-
-Please create a file with your feedback under `.management/feedback` and open a Pull Request with it.
-
-Thanks for playing!
+Try to commit something.
 
 ## License
 

githooks/commit-msg

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ grep -i "git is awesome" $1 ]; then
+	echo "Write 'git is awesome' in your commit message"
+	exit 1
+else
+	echo "I agree; git is awesome!"
+	exit 0
+fi

setup_stage_10.sh

@@ -0,0 +1,7 @@
+echo "Setting up stage 10..."
+
+cd .git/hooks
+ln -s -f ../../githooks/pre-commit pre-commit
+cd ..
+
+echo "Done."