fix l8 and include checking of refnames in check script.

This commit is contained in:
Joe Tretter
2020-09-15 16:33:35 -05:00
parent 962b2828f0
commit 36d00a836b
3 changed files with 12 additions and 1 deletions

View File

@@ -11,6 +11,7 @@ git ls-files > "${tmpDir}/goalStageFiles.txt"
git log origin/master...master --pretty=format:%D > "${tmpDir}/goalPushState.txt" git log origin/master...master --pretty=format:%D > "${tmpDir}/goalPushState.txt"
git branch -a | sort > "${tmpDir}/goalBranchSetup.txt" git branch -a | sort > "${tmpDir}/goalBranchSetup.txt"
git remote -v | sort > "${tmpDir}/goalRemotes.txt" git remote -v | sort > "${tmpDir}/goalRemotes.txt"
git log -n 1 --pretty=tformat:%D > "${tmpDir}/goalRefNames.txt"
cd .. cd ..
cd 5_work 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 log origin/master...master --pretty=format:%D > "${tmpDir}/workPushState.txt"
git branch -a | sort > "${tmpDir}/workBranchSetup.txt" git branch -a | sort > "${tmpDir}/workBranchSetup.txt"
git remote -v | sort > "${tmpDir}/workRemotes.txt" git remote -v | sort > "${tmpDir}/workRemotes.txt"
git log -n 1 --pretty=tformat:%D > "${tmpDir}/workRefNames.txt"
cd .. cd ..
cd "${tmpDir}" cd "${tmpDir}"
@@ -64,3 +66,11 @@ else echo "FAIL"
echo echo
fi 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

View File

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

View File

@@ -6,3 +6,4 @@ cat translations.txt | grep -ve "[<>=]" > $$.dat
mv $$.dat translations.txt mv $$.dat translations.txt
git add translations.txt git add translations.txt
git rebase --continue git rebase --continue
git push -f