mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-12 16:26:08 +02:00
Code

Merge branch 'js/fsck-name-objects-fix' 

Fix "git fsck --name-objects" which apparently has not been used by
anybody who is motivated enough to report breakage.

* js/fsck-name-objects-fix:
  fsck --name-objects: be more careful parsing generation numbers
  t1450: robustify `remove_object()`
This commit is contained in:
Junio C Hamano 2021-02-17 17:21:42 -08:00
parent 9bdccbcda7 e89f89361c
commit 9e634a91c8
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fsck.c
View File

@ -463,6 +463,11 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
generation += power * (name[--len] - '0');
if (power > 1 && len && name[len - 1] == '~')
name_prefix_len = len - 1;
else {
/* Maybe a non-first parent, e.g. HEAD^2 */
generation = 0;
name_prefix_len = len;
}
}
}

26
t/t1450-fsck.sh
View File

@ -40,17 +40,13 @@ test_expect_success 'HEAD is part of refs, valid objects appear valid' '
# specific corruption you test afterwards, lest a later test trip over
# it.
test_expect_success 'setup: helpers for corruption tests' '
sha1_file() {
remainder=${1#??} &&
firsttwo=${1%$remainder} &&
echo ".git/objects/$firsttwo/$remainder"
} &&
sha1_file () {
git rev-parse --git-path objects/$(test_oid_to_path "$1")
}
remove_object() {
rm "$(sha1_file "$1")"
}
'
remove_object () {
rm "$(sha1_file "$1")"
}
test_expect_success 'object with bad sha1' '
sha=$(echo blob | git hash-object -w --stdin) &&
@ -662,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
)
'