commit 52f1ade2981d662c4555a2eed4cabc997f5264695cdee210188a021c7f78f0ee from: Stefan Sperling date: Tue Jan 21 22:18:07 2025 UTC do not delete objects reached via nested tags during 'gotadmin cleanup' Make gotadmin cleanup resolve multiple levels of nested tags, in order to ensure that objects referenced via nested tags will not get deleted. Add test coverage for this edge case. commit - af700917c8017469533c45b134cba54c1b85a4c856e8e9bfe2dc980d632e7455 commit + 52f1ade2981d662c4555a2eed4cabc997f5264695cdee210188a021c7f78f0ee blob - 3aecb04aa73adb423f549b54bd1a8ad070931a1527ef07265393664e95449089 blob + c07ec4c4e2499fc0c793f5412fae673d3519dbb151eb116b22c8fa933b313b0f --- lib/repository_admin.c +++ lib/repository_admin.c @@ -1011,33 +1011,55 @@ load_commit_or_tag(int *ncommits, struct got_object_id } if (tag) { - /* Find a tree object to scan. */ + struct got_object_id *id; + obj_type = got_object_tag_get_object_type(tag); + while (obj_type == GOT_OBJ_TYPE_TAG) { + struct got_tag_object *next_tag; + + id = got_object_tag_get_object_id(tag); + if (!got_object_idset_contains(traversed_ids, + id)) { + err = got_object_idset_add( + traversed_ids, id, NULL); + if (err) + goto done; + } + + err = got_object_open_as_tag(&next_tag, repo, + id); + if (err) + goto done; + + got_object_tag_close(tag); + tag = next_tag; + obj_type = got_object_tag_get_object_type(tag); + } + id = got_object_tag_get_object_id(tag); switch (obj_type) { case GOT_OBJ_TYPE_COMMIT: err = got_object_open_as_commit(&commit, repo, - got_object_tag_get_object_id(tag)); + id); if (err) goto done; tree_id = got_object_commit_get_tree_id(commit); break; case GOT_OBJ_TYPE_TREE: - tree_id = got_object_tag_get_object_id(tag); + tree_id = id; break; - default: - /* - * Tag points at something other than a - * commit or tree. Leave this weird tag object - * and the object it points to. - */ + case GOT_OBJ_TYPE_BLOB: if (got_object_idset_contains(traversed_ids, - got_object_tag_get_object_id(tag))) + id)) break; - err = got_object_idset_add(traversed_ids, - got_object_tag_get_object_id(tag), NULL); + err = got_object_idset_add(traversed_ids, id, + NULL); if (err) goto done; break; + default: + /* should not happen */ + err = got_error(GOT_ERR_OBJ_TYPE); + goto done; } } else if (tree_id == NULL) { /* Blob which has already been marked as traversed. */ blob - 6a1d45c45cdfae8328a8922f60200e57b26d0693e1defcf5c0c83797bf4c1101 blob + 3e9ba7049ef967a632e09aa7769d1c0feac574264f9113b16623753061d6c467 --- regress/cmdline/cleanup.sh +++ regress/cmdline/cleanup.sh @@ -500,12 +500,104 @@ test_cleanup_non_commit_ref() { # create a reference which points at the tree got ref -r $testroot/repo -c "$tree_id" treeref + inner_tag_date=$(date +%s) + + # Create a nested tag of another tree. + # Ensure that gotadmin cleanup follows chains of tags and + # all objects referenced via this chain. + + echo bar > $testroot/t/bar + bar_id=$(git -C $testroot/repo hash-object -t blob -w $testroot/t/bar) + + printf "10644 blob $foo_id\tfoo\n" > $testroot/tree-desc2 + printf "10644 blob $bar_id\tbar\n" >> $testroot/tree-desc2 + tree_id2=$(git -C $testroot/repo mktree < $testroot/tree-desc2) + + # verify that the second tree object can be read + got cat -r $testroot/repo "$tree_id2" > $testroot/stdout + printf "$bar_id 0010644 bar\n" > $testroot/stdout.expected + printf "$foo_id 0010644 foo\n" >> $testroot/stdout.expected + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + cat > $testroot/inner-tag-desc < $testroot/stdout + + cat > $testroot/stdout.expected < $testroot/tag-desc < $testroot/stdout + + cat > $testroot/stdout.expected < $testroot/stdout cat > $testroot/stdout.expected < $testroot/stdout + printf "$bar_id 0010644 bar\n" > $testroot/stdout.expected + printf "$foo_id 0010644 foo\n" >> $testroot/stdout.expected + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + + # verify that the inner tag object can be read + got cat -r $testroot/repo "$inner_tag_id" > $testroot/stdout + + cat > $testroot/stdout.expected < $testroot/stdout + + cat > $testroot/stdout.expected <