diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-26 13:17:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-26 13:17:24 -0700 |
commit | f14acabf3ac8147d800017160d67e8192fe1ee80 (patch) | |
tree | 1e81374e9c2ed15271656417587906ee9914f175 /t | |
parent | cca92531e3f836733d246c9696ce6a7059ae10ad (diff) | |
parent | 6d2d780f6359df424a625a51f09da80ab6dc1ef8 (diff) | |
download | git-f14acabf3ac8147d800017160d67e8192fe1ee80.tar.gz |
Merge branch 'jc/fsck-nul-in-commit' into maint
"git fsck" learned to catch NUL byte in a commit object as
potential error and warn.
* jc/fsck-nul-in-commit:
fsck: detect and warn a commit with embedded NUL
fsck_commit_buffer(): do not special case the last validation
Diffstat (limited to 't')
-rwxr-xr-x | t/t1450-fsck.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index e66b7cb697..7ee8ea004f 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -427,6 +427,24 @@ test_expect_success 'fsck allows .Ňit' ' ) ' +test_expect_success 'NUL in commit' ' + rm -fr nul-in-commit && + git init nul-in-commit && + ( + cd nul-in-commit && + git commit --allow-empty -m "initial commitQNUL after message" && + git cat-file commit HEAD >original && + q_to_nul <original >munged && + git hash-object -w -t commit --stdin <munged >name && + git branch bad $(cat name) && + + test_must_fail git -c fsck.nulInCommit=error fsck 2>warn.1 && + grep nulInCommit warn.1 && + git fsck 2>warn.2 && + grep nulInCommit warn.2 + ) +' + # create a static test repo which is broken by omitting # one particular object ($1, which is looked up via rev-parse # in the new repository). |