diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-08-23 11:33:15 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-25 10:43:16 -0700 |
commit | 471af6c2fd63fa6139682aade26aa5039df911c0 (patch) | |
tree | db531478f6e4860590d70e5a369c55523009e117 /save-git.c | |
parent | f5eb0e2bbb6224b69bcf95b4d89d443c576808ad (diff) | |
download | subsurface-471af6c2fd63fa6139682aade26aa5039df911c0.tar.gz |
Cloud storage: clean up after the merge
Make sure the branch is pointing at the merge commit, etc.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'save-git.c')
-rw-r--r-- | save-git.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/save-git.c b/save-git.c index 9ae1d572e..3cd8a8a2c 100644 --- a/save-git.c +++ b/save-git.c @@ -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; |