diff: allow --patch & cie to override -s/--no-patch
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Tue, 16 Jul 2013 08:05:37 +0000 (10:05 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 00:50:56 +0000 (17:50 -0700)
commit71482d389d0b214d2cfc2adf788ba1011a7dcb18
treeeed10dcbed7a53968a322849650287642b3bf23d
parentd09cd15d19de23aca532a85f6d27a71b2baceb3f
diff: allow --patch & cie to override -s/--no-patch

All options that trigger a patch output now override --no-patch.

The case of --binary deserves extra attention: the name may suggest that
it turns a normal patch into a binary patch, but it actually already
enables patch output when normally disabled (e.g. "git log --binary"
displays a patch), hence it makes sense for "git show --no-patch
--binary" to display the binary patch.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
t/t4000-diff-format.sh