summaryrefslogtreecommitdiff
path: root/t/t3031-merge-criscross.sh
diff options
context:
space:
mode:
authorLibravatar Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>2019-11-19 16:48:51 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-11-20 13:01:53 +0900
commit24e4750c969b844536af1d286e7d977c74c078a2 (patch)
tree0b5be5c3f0873076b4035fb7d4ec67f37f53f160 /t/t3031-merge-criscross.sh
parentparse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` (diff)
downloadtgif-24e4750c969b844536af1d286e7d977c74c078a2.tar.xz
pathspec: add new function to parse file
This will be used to support the new option '--pathspec-from-file' in `git add`, `git-commit`, `git reset` etc. Note also that we specifically handle CR/LF line endings to support Windows better. To simplify code, file is first parsed into `argv_array`. This allows to avoid refactoring `parse_pathspec()`. I considered adding `nul_term_line` to `flags` instead, but decided that it doesn't fit there. The new code is mostly taken from `cmd_update_index()` and `split_mail_conv()`. Co-authored-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3031-merge-criscross.sh')
0 files changed, 0 insertions, 0 deletions