josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git tools: a few minor improvements. 

Behaviour should be unchanged, but the same tools can be used for
gEDA/pcb now, too.
This commit is contained in:
Markus Hitter 2015-09-14 15:24:03 +02:00
parent 47f0f0045c
commit 959e803eac
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/git-regtest
View File

@ -42,7 +42,7 @@ PARENTS=$(git log --oneline --ancestry-path \
let PARENTS1=${PARENTS}+1 let PARENTS1=${PARENTS}+1
echo "${PARENTS1} commits to go." echo "${PARENTS1} commits to go."
trap "echo -n \"Current commit is \" trap "echo -n \"Current commit is\"
git log HEAD^..HEAD | head -5 | tail -1" 0 git log HEAD^..HEAD | head -5 | tail -1" 0
while [ ${PARENTS} -ge 0 ]; do while [ ${PARENTS} -ge 0 ]; do
@ -58,7 +58,10 @@ while [ ${PARENTS} -ge 0 ]; do
git checkout ${CURRENT_BRANCH}~${PARENTS} git checkout ${CURRENT_BRANCH}~${PARENTS}
fi fi
make regressiontests || exit 1 # Check wether target 'regressiontest' or 'check' or whatever exists, then
# run the test.
make -n regressiontests >/dev/null 2>&1 && (make regressiontests || exit 1)
make -n check >/dev/null 2>&1 && ((make && make check) || exit 1)
let PARENTS=${PARENTS}-1 let PARENTS=${PARENTS}-1
done done

3
tools/git-step-rebase
View File

@ -41,8 +41,7 @@ COMMON_PARENT=$(git merge-base HEAD ${BASE_BRANCH})
echo echo
echo "Common parent is ${COMMON_PARENT}." echo "Common parent is ${COMMON_PARENT}."
PARENTS=$(git log --oneline --ancestry-path ${COMMON_PARENT}..${BASE_BRANCH} | \ PARENTS=$(git rev-list ${COMMON_PARENT}..${BASE_BRANCH} | wc -l)
wc -l)
echo "${PARENTS} commits to go." echo "${PARENTS} commits to go."
let PARENTS=${PARENTS}-1 let PARENTS=${PARENTS}-1