]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: de90581)
merge-tree: allow `ls-files -u` style info to be NUL terminated
authorElijah Newren <redacted>
Sat, 18 Jun 2022 00:20:58 +0000 (00:20 +0000)
committerJunio C Hamano <redacted>
Wed, 22 Jun 2022 23:10:06 +0000 (16:10 -0700)
commit7c48b27822b280222be1df7ec9f9e98d688f933b
tree0d2a9f250d1d1a0671bec02ed630bef9877e940etree
parentde90581141a886a79cccd0d9adb76814f3e1ab2ccommit | diff
merge-tree: allow `ls-files -u` style info to be NUL terminated

Much as `git ls-files` has a -z option, let's add one to merge-tree so
that the conflict-info section can be NUL terminated (and avoid quoting
of unusual filenames).

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-merge-tree.txt diff | blob | history
builtin/merge-tree.c diff | blob | history
t/t4301-merge-tree-write-tree.sh diff | blob | history
git clone https://git.99rst.org/PROJECT