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

git-step-rebase: try the faster standard rebase mode. 

Standard mode, like without ignoring whitespace changes. Only if
that fails, try again with whitespace ignorance.

Reason for this attempt is, rebases not ignoring whitespace are
significantly faster and much less verbose. As 99% of all rebases
work fine without ignoring whitespace, it's a good idea to try
that first.
This commit is contained in:
Markus Hitter 2017-04-25 20:26:23 +02:00
parent 92926aadf5
commit 7a36302cd7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/git-step-rebase
View File

@ -55,8 +55,14 @@ wait_count 5
while [ ${PARENTS} -ge 0 ]; do while [ ${PARENTS} -ge 0 ]; do
echo -e "Next: rebasing to \033[1m${BASE_BRANCH}~${PARENTS}\033[0m" echo -e "Next: rebasing to \033[1m${BASE_BRANCH}~${PARENTS}\033[0m"
sleep 1 sleep 1
if ! git rebase -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then if ! git rebase --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then
exit echo
echo "Standard rebase failed."
echo "Trying again, this time ignoring whitespace ..."
git rebase --abort
if ! git rebase -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then
exit
fi
fi fi
let PARENTS=${PARENTS}-1 let PARENTS=${PARENTS}-1
done done