summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-30 13:27:11 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-30 13:47:55 +0900
commitd8981c3f885ceaddfec0e545b0f995b96e5ec58f (patch)
tree7337c0018c55bb91e000b78c8c2b8e973e71e070 /upload-pack.c
parentMerge branch 'ja/i18n-fix' (diff)
downloadtgif-d8981c3f885ceaddfec0e545b0f995b96e5ec58f.tar.xz
format-patch: do not let its diff-options affect --range-diff
Stop leaking how the primary output of format-patch is customized to the range-diff machinery and instead let the latter use its own "reasonable default", in order to correct the breakage introduced by a5170794 ("Merge branch 'ab/range-diff-no-patch'", 2018-11-18) on the 'master' front. "git format-patch --range-diff..." without any weird diff option started to include the "range-diff --stat" output, which is rather useless right now, that made the whole thing unusable and this is probably the least disruptive way to whip the codebase into a shippable shape. We may want to later make the range-diff driven by format-patch more configurable, but that would have to wait until we have a good design. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions