Merge fixes early for next maint series.

diff --cc commit.c
Simple merge

diff --cc git-clone.sh
Simple merge

diff --cc git-merge.sh
Simple merge

diff --cc read-tree.c
Simple merge

diff --cc sha1_file.c
Simple merge