commit - 52af279be5111c88a19197896b4e2a36645a657ac095436ce07b30a6f07528cb
commit + af700917c8017469533c45b134cba54c1b85a4c856e8e9bfe2dc980d632e7455
blob - 467e6f1a43ba8c05f98b8445b5077fd3295a8268abda8f88937314bce5ba8f33
blob + 3aecb04aa73adb423f549b54bd1a8ad070931a1527ef07265393664e95449089
--- lib/repository_admin.c
+++ lib/repository_admin.c
&qid->id);
if (err)
goto done;
+ tree_id = got_object_commit_get_tree_id(commit);
break;
case GOT_OBJ_TYPE_TAG:
err = got_object_open_as_tag(&tag, repo, &qid->id);
if (err)
goto done;
+ /* tree_id will be set below */
break;
+ case GOT_OBJ_TYPE_TREE:
+ tree_id = &qid->id;
+ break;
+ case GOT_OBJ_TYPE_BLOB:
+ tree_id = NULL;
+ break;
default:
/* should not happen */
err = got_error(GOT_ERR_OBJ_TYPE);
goto done;
}
- /* Find a tree object to scan. */
- if (commit) {
- tree_id = got_object_commit_get_tree_id(commit);
- } else if (tag) {
+ if (tag) {
+ /* Find a tree object to scan. */
obj_type = got_object_tag_get_object_type(tag);
switch (obj_type) {
case GOT_OBJ_TYPE_COMMIT:
goto done;
break;
}
+ } else if (tree_id == NULL) {
+ /* Blob which has already been marked as traversed. */
+ continue;
}
if (tree_id) {
repo, cancel_cb, cancel_arg);
if (err)
break;
+ tree_id = NULL;
}
if (commit || tag)
}
err = get_reflist_object_ids(&referenced_ids, &nreferenced,
- (1 << GOT_OBJ_TYPE_COMMIT) | (1 << GOT_OBJ_TYPE_TAG),
- &refs, repo, cancel_cb, cancel_arg);
+ GOT_OBJ_TYPE_ANY, &refs, repo, cancel_cb, cancel_arg);
if (err)
goto done;
blob - 57400ae20d6bdf9bc5ece96af1c23769f9db287d4ded87b5ea2dd73194f90034
blob + 6a1d45c45cdfae8328a8922f60200e57b26d0693e1defcf5c0c83797bf4c1101
--- regress/cmdline/cleanup.sh
+++ regress/cmdline/cleanup.sh
test_done "$testroot" "$ret"
}
+test_cleanup_non_commit_ref() {
+ local testroot=`test_init cleanup_non_commit_ref`
+ local commit_id=`git_show_head $testroot/repo`
+
+ mkdir -p $testroot/t
+ echo foo > $testroot/t/foo
+
+ foo_id=$(git -C $testroot/repo hash-object -t blob -w $testroot/t/foo)
+
+ # verify that the blob object can be read
+ got cat -r $testroot/repo "$foo_id" > $testroot/stdout
+ cmp -s $testroot/t/foo $testroot/stdout
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/t/foo $testroot/stdout
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ # create a reference which points at the blob
+ got ref -r $testroot/repo -c $foo_id blobref
+
+ # create a tree object
+ printf "10644 blob $foo_id\tfoo\n" > $testroot/tree-desc
+ tree_id=$(git -C $testroot/repo mktree < $testroot/tree-desc)
+
+ # verify that the tree object can be read
+ got cat -r $testroot/repo "$tree_id" > $testroot/stdout
+ 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
+
+ # create a reference which points at the tree
+ got ref -r $testroot/repo -c "$tree_id" treeref
+
+ # list references
+ got ref -r $testroot/repo -l > $testroot/stdout
+ cat > $testroot/stdout.expected <<EOF
+HEAD: refs/heads/master
+refs/blobref: $foo_id
+refs/heads/master: $commit_id
+refs/treeref: $tree_id
+EOF
+ 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
+
+ # gotadmin cleanup should not purge referenced objects
+ gotadmin cleanup -a -q -r $testroot/repo > $testroot/stdout \
+ 2> $testroot/stderr
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ echo "gotadmin cleanup failed unexpectedly" >&2
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ # verify that the blob object can be read
+ got cat -r $testroot/repo "$foo_id" > $testroot/stdout
+ cmp -s $testroot/t/foo $testroot/stdout
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/t/foo $testroot/stdout
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ # verify that the tree object can be read
+ got cat -r $testroot/repo "$tree_id" > $testroot/stdout
+ 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
+
+ test_done "$testroot" "$ret"
+}
+
test_parseargs "$@"
run_test test_cleanup_unreferenced_loose_objects
run_test test_cleanup_redundant_loose_objects
run_test test_cleanup_redundant_pack_files
run_test test_cleanup_precious_objects
run_test test_cleanup_missing_pack_file
+run_test test_cleanup_non_commit_ref