mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cloud storage: clean up after the merge

Browse source 
Make sure the branch is pointing at the merge commit, etc.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-08-23 11:33:15 -07:00
parent f5eb0e2bbb
commit 471af6c2fd
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
save-git.c
View file

@ -997,7 +997,7 @@ static git_tree *get_git_tree(git_repository *repo, git_object *parent)
return tree;
}
static int update_git_checkout(git_repository *repo, git_object *parent, git_tree *tree)
int update_git_checkout(git_repository *repo, git_object *parent, git_tree *tree)
{
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;