For some reason, combined diffs don't honour the --full-index flag when
emitting patches.  Fix this.
Signed-off-by: NMark Wooding <mdw@distorted.org.uk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
(cherry picked from e70c6b35 commit)