Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix-rename-leak' into next

* maint:
Give no terminating LF to error() function.

* jc/fix-co-candy:
checkout - eye candy.

* jc/fix-rename-leak:
diffcore-rename: plug memory leak.

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