diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-28 13:37:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-28 13:37:55 -0800 |
| commit | 177bd65cf8601216e906ad56ceb6a46f57df22fa (patch) | |
| tree | b7eb2ee9a3fe8dced866b236e3031f70ca0d9d55 /t/t5515-fetch-merge-logic.sh | |
| parent | Merge branch 'sb/status-doc-fix' (diff) | |
| parent | apply: handle Subversion diffs with /dev/null gracefully (diff) | |
| download | tgif-177bd65cf8601216e906ad56ceb6a46f57df22fa.tar.xz | |
Merge branch 'tk/apply-dev-null-verify-name-fix'
Many places in "git apply" knew that "/dev/null" that signals
"there is no such file on this side of the diff" can be followed by
whitespace and garbage when parsing a patch, except for one, which
made an otherwise valid patch (e.g. ones from subversion) rejected.
* tk/apply-dev-null-verify-name-fix:
apply: handle Subversion diffs with /dev/null gracefully
apply: demonstrate a problem applying svn diffs
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions