format-patch: use default diff format even with patch options
authorJeff King <peff@peff.net>
Mon, 25 Aug 2008 02:10:29 +0000 (22:10 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Aug 2008 00:08:13 +0000 (17:08 -0700)
commit68daa64df2363f848d818dda9fc414511d9330da
tree8c6356e7b8df411c3ef4cfeb9a4181deef25b255
parent27a6ed492b3962d8214a196e57e8969ff9772249
format-patch: use default diff format even with patch options

Previously, running "git format-patch -U5" would cause the
low-level diff machinery to change the diff output format
from "not specified" to "patch". This meant that
format-patch thought we explicitly specified a diff output
format, and would not use the default format. The resulting
message lacked both the diffstat and the summary, as well as
the separating "---".

Now format-patch explicitly checks for this condition and
uses the default. That means that "git format-patch -p" will
now have the "-p" ignored.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-log.c
t/t4014-format-patch.sh