Skip to content

Commit 095a3cf

Browse files
committed
Keep NUL bytes in Repository.raw_message
Same truncation as in FilterList: ffi.string(buf.ptr) cut MERGE_MSG at the first NUL byte. Repository.message decodes raw_message, so it now keeps the text after the NUL too. Assisted-by: Claude Opus 5.5 (Claude Code)
1 parent 06f8788 commit 095a3cf

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

‎pygit2/repository.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@ def raw_message(self) -> bytes:
12951295
if err == C.GIT_ENOTFOUND:
12961296
return b''
12971297
check_error(err)
1298-
return ffi.string(buf.ptr)
1298+
return ffi.buffer(buf.ptr, buf.size)[:]
12991299
finally:
13001300
C.git_buf_dispose(buf)
13011301

‎test/test_merge.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,11 @@ def test_merge_message(mergerepo: Repository) -> None:
333333
assert not mergerepo.message
334334

335335

336+
def test_merge_raw_message_keeps_nul_bytes(mergerepo: Repository) -> None:
337+
Path(mergerepo.path, 'MERGE_MSG').write_bytes(b'Merge\x00tail\n')
338+
assert mergerepo.raw_message == b'Merge\x00tail\n'
339+
340+
336341
def test_merge_remove_message(mergerepo: Repository) -> None:
337342
branch_head = pygit2.Oid(hex='1b2bae55ac95a4be3f8983b86cd579226d0eb247')
338343
mergerepo.merge(branch_head)

0 commit comments

Comments
 (0)