From 36d00a836ba48d6e73ec8b2e137e20e8c9ffe380 Mon Sep 17 00:00:00 2001
From: Joe Tretter <j.tretter@gmail.com>
Date: Tue, 15 Sep 2020 16:33:35 -0500
Subject: [PATCH] fix l8 and include checking of refnames in check script.

---
 B_Compare.sh                   | 10 ++++++++++
 l8/1_overlay/_Instructions.txt |  2 +-
 l8/5_solution.sh               |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/B_Compare.sh b/B_Compare.sh
index c2fb6c2..a458077 100755
--- a/B_Compare.sh
+++ b/B_Compare.sh
@@ -11,6 +11,7 @@ git ls-files > "${tmpDir}/goalStageFiles.txt"
 git log origin/master...master --pretty=format:%D > "${tmpDir}/goalPushState.txt"
 git branch -a | sort > "${tmpDir}/goalBranchSetup.txt"
 git remote -v | sort > "${tmpDir}/goalRemotes.txt"
+git log -n 1 --pretty=tformat:%D > "${tmpDir}/goalRefNames.txt"
 cd ..
 
 cd 5_work
@@ -19,6 +20,7 @@ git ls-files > "${tmpDir}/workStageFiles.txt"
 git log origin/master...master --pretty=format:%D > "${tmpDir}/workPushState.txt"
 git branch -a | sort > "${tmpDir}/workBranchSetup.txt"
 git remote -v | sort > "${tmpDir}/workRemotes.txt"
+git log -n 1 --pretty=tformat:%D > "${tmpDir}/workRefNames.txt"
 cd ..
 
 cd "${tmpDir}"
@@ -64,3 +66,11 @@ else echo "FAIL"
 	echo
 fi
 
+echo -n "REFNAMES - "
+if [[ $(cmp -s "${tmpDir}/goalRefNames.txt" "${tmpDir}/workRefNames.txt";echo $?) == 0 ]]
+then echo "OK"
+else echo "FAIL"
+	diff -y --color=always *RefNames.txt
+	echo
+fi
+
diff --git a/l8/1_overlay/_Instructions.txt b/l8/1_overlay/_Instructions.txt
index 6470e44..41a40ce 100644
--- a/l8/1_overlay/_Instructions.txt
+++ b/l8/1_overlay/_Instructions.txt
@@ -1 +1 @@
-1) You worked in the branch "DEV" for a while and now you want to re-base to the Head of the Master branch so that merging the pull request is easier.  
+1) You worked in the branch "DEV" for a while and now you want to re-base to the Head of the Master branch so that merging the pull request is easier. Don't forget to push your re-basing to the remote branch!
diff --git a/l8/5_solution.sh b/l8/5_solution.sh
index 613eec2..82a0a49 100755
--- a/l8/5_solution.sh
+++ b/l8/5_solution.sh
@@ -6,3 +6,4 @@ cat translations.txt | grep -ve "[<>=]" > $$.dat
 mv $$.dat translations.txt
 git add translations.txt
 git rebase --continue
+git push -f