git-pull suggests deprecated git-branch --set-upstream flag

I just ran git pull, and it suggested that I should use `git branch
--set-upstream`. Yet when I used it, git-branch told me that the flag is
deprecated. Git version 1.8.0.

tom