update.sh would enter an infinite loop when arguments (e.g. --ours, --check). This is due to a missing `shift` statement that has now been added. This fixes #1193.