summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-branches-one-merge_branches-one
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2009-11-04 02:19:40 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-08 17:01:36 -0800
commit1d46f2ea143534e46e6bfee3f34cd90b734bfe80 (patch)
treeeae8ece6e65ceb4ebb8880f7227f7e4cbe132a6e /t/t5515/refs.br-branches-one-merge_branches-one
parentGIT 1.6.5 (diff)
downloadtgif-1d46f2ea143534e46e6bfee3f34cd90b734bfe80.tar.xz
format-patch: make "-p" suppress diffstat
Once upon a time, format-patch would use its default stat plus patch format only when no diff format was given on the command line. This meant that "format-patch -p" would suppress the stat and show just the patch. Commit 68daa64 changed this to keep the stat format when we had an "implicit" patch format, like "-U5". As a side effect, this meant that an explicit patch format was now ignored (because cmd_format_patch didn't know the reason that the format was set way down in diff_opt_parse). This patch unbreaks what 68daa64 did (while still preserving what 68daa64 was trying to do), reinstating "-p" to suppress the default behavior. We do this by parsing "-p" ourselves in format-patch, and noting whether it was used explicitly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/refs.br-branches-one-merge_branches-one')
0 files changed, 0 insertions, 0 deletions