From e89f89361cd7b706858eb22a6cf3d59d31a00acf Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 10 Feb 2021 18:01:30 +0000 Subject: fsck --name-objects: be more careful parsing generation numbers In 7b35efd734e (fsck_walk(): optionally name objects on the go, 2016-07-17), the `fsck` machinery learned to optionally name the objects, so that it is easier to see what part of the repository is in a bad shape, say, when objects are missing. To save on complexity, this machinery uses a parser to determine the name of a parent given a commit's name: any `~` suffix is parsed and the parent's name is formed from the prefix together with `~`. However, this parser has a bug: if it finds a suffix `` that is _not_ `~`, it will mistake the empty string for the prefix and `` for the generation number. In other words, it will generate a name of the form `~`. Let's fix this. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- t/t1450-fsck.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 't/t1450-fsck.sh') diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 0c58cb349b..d3a3d2722b 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -658,13 +658,15 @@ test_expect_success 'fsck --name-objects' ' git init name-objects && ( cd name-objects && + git config core.logAllRefUpdates false && test_commit julius caesar.t && - test_commit augustus && - test_commit caesar && + test_commit augustus44 && + test_commit caesar && remove_object $(git rev-parse julius:caesar.t) && - test_must_fail git fsck --name-objects >out && tree=$(git rev-parse --verify julius:) && - test_i18ngrep "$tree (refs/tags/julius:" out + git tag -d julius && + test_must_fail git fsck --name-objects >out && + test_i18ngrep "$tree (refs/tags/augustus44\\^:" out ) ' -- cgit v1.2.3