haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-16 07:10:07 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.1'

Browse Source
This commit is contained in:
Jonathan Xu
2017-07-07 11:19:27 +08:00
parent 548026895d e096ccdfa8
commit 0db8ef8f2d
17 changed files with 1020 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/repo-mgr.c
View File

@@ -2464,6 +2464,15 @@ collect_trash_repo (SeafDBRow *row, void *data)
if (!trash_repo)
return FALSE;
SeafCommit *commit = seaf_commit_manager_get_commit_compatible (seaf->commit_mgr,
repo_id, head_id);
if (!commit) {
seaf_warning ("Commit %s not found in repo %s\n", head_id, repo_id);
return FALSE;
}
g_object_set (trash_repo, "encrypted", commit->encrypted, NULL);
seaf_commit_unref (commit);
*trash_repos = g_list_prepend (*trash_repos, trash_repo);
return TRUE;