[MERGE] Port across errors for shallow branch support.

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> This patch contains the errors needed to add shallow branch support.

bb:approve

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH0HvR0F+nu1YWqI0RAm62AJ0VwgIlpSY42hpUW1J2oYZvnG+HbACdHobm
A7CbNI7WRawj7Wz/4gIUD1c=
=Vz8A
-----END PGP SIGNATURE-----