git pull fails to exit with non-zero status after fatal error

We have just upgraded to 1.5 (don't know if this is specific to 1.5, but just in case). When I perform a git-pull on a working repo that has a modified file, git pull refuses to do the pull, as shown below:

$ git pull Updating b5d9263..506b347 tools/Pvt/Pvt.py: needs update fatal: Entry 'tools/Pvt/Pvt.py' not uptodate. Cannot merge. $ echo $? 0

Notice the exit status of 0. The driver scripts I use rely on a non-zero status to send me email when the git-pull fails, but this case eludes detection.

I'm assuming this is a bug, but if it's intended behavior I'd like to understand why it would use a 0 exit status after a issuing a fatal error.

Thanks, Larry.