]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: de90581) | patch
merge-tree: allow `ls-files -u` style info to be NUL terminated
authorElijah Newren <newren@gmail.com>
Sat, 18 Jun 2022 00:20:58 +0000 (00:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jun 2022 23:10:06 +0000 (16:10 -0700)
commit7c48b27822b280222be1df7ec9f9e98d688f933b
tree0d2a9f250d1d1a0671bec02ed630bef9877e940etree | snapshot
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge-tree.txt diff | blob | blame | history
builtin/merge-tree.c diff | blob | blame | history
t/t4301-merge-tree-write-tree.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.