author | Junio C Hamano <gitster@pobox.com> | |
Sat, 10 Jan 2009 06:21:36 +0000 (22:21 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 10 Jan 2009 06:21:36 +0000 (22:21 -0800) | ||
commit | 64912a67a43dec151906b93f96b07f16e17f71e9 | |
tree | ba3b578d02df18a302f064130e192b032d46bae4 | tree | snapshot |
parent | f26c4940c4c7942a95058d9aaef7b01967085a60 | commit | diff |
Resurrect "git apply --flags -" to read from the standard input
The previous "parse-opt"ification broke git-apply reading from the
standard input. "git apply A - C <B" is supposed to read patches from
files A, B and C in this order.
Before "parse-opt"ification, we used be able to:
git apply --stat - --apply <A B
to read the patch from file A, showing only the diffstat, and then read the
patch from file B, showing the diffstat and actually applying it. Even
with this fix we cannot do that anymore, but that is so crazy use case I
do not think anybody sane relied on such a broken behaviour.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The previous "parse-opt"ification broke git-apply reading from the
standard input. "git apply A - C <B" is supposed to read patches from
files A, B and C in this order.
Before "parse-opt"ification, we used be able to:
git apply --stat - --apply <A B
to read the patch from file A, showing only the diffstat, and then read the
patch from file B, showing the diffstat and actually applying it. Even
with this fix we cannot do that anymore, but that is so crazy use case I
do not think anybody sane relied on such a broken behaviour.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-apply.c | diff | blob | history | |
t/t4106-apply-stdin.sh | [new file with mode: 0755] | blob |