diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-01-03 15:53:50 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-01-03 15:53:50 -0600 |
| commit | ad2bc32fa3e6958c2d975838712d6e3552abb838 (patch) | |
| tree | 2426bf188ae68224a69e518e4b31eddfad92acc0 | |
| parent | 07871d3adcfdaba7ad5f99f89299258d1dbd92f9 (diff) | |
| download | libgit2-ad2bc32fa3e6958c2d975838712d6e3552abb838.tar.gz | |
expose merge metadata cleanup
| -rw-r--r-- | include/git2/repository.h | 9 | ||||
| -rw-r--r-- | src/merge.c | 2 | ||||
| -rw-r--r-- | src/merge.h | 1 | ||||
| -rw-r--r-- | src/reset.c | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/include/git2/repository.h b/include/git2/repository.h index 96b47f440..02e689111 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -490,6 +490,15 @@ GIT_EXTERN(int) git_repository_message(char *out, size_t len, git_repository *re */ GIT_EXTERN(int) git_repository_message_remove(git_repository *repo); +/** + * Remove all the metadata associated with an ongoing git merge, including + * MERGE_HEAD, MERGE_MSG, etc. + * + * @param repo A repository object + * @return 0 on success, or error + */ +GIT_EXTERN(int) git_repository_merge_cleanup(git_repository *repo); + typedef int (*git_repository_fetchhead_foreach_cb)(const char *ref_name, const char *remote_url, const git_oid *oid, diff --git a/src/merge.c b/src/merge.c index 1386d0908..dfdadca81 100644 --- a/src/merge.c +++ b/src/merge.c @@ -15,7 +15,7 @@ #include "git2/reset.h" #include "commit_list.h" -int git_merge__cleanup(git_repository *repo) +int git_repository_merge_cleanup(git_repository *repo) { int error = 0; git_buf merge_head_path = GIT_BUF_INIT, diff --git a/src/merge.h b/src/merge.h index 3681e24b7..af24de474 100644 --- a/src/merge.h +++ b/src/merge.h @@ -16,7 +16,6 @@ #define MERGE_CONFIG_FILE_MODE 0666 -int git_merge__cleanup(git_repository *repo); int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_list_node *one, git_vector *twos); #endif diff --git a/src/reset.c b/src/reset.c index 17b4b900c..784094a1f 100644 --- a/src/reset.c +++ b/src/reset.c @@ -126,7 +126,7 @@ int git_reset( goto cleanup; } - if ((error = git_merge__cleanup(repo)) < 0) { + if ((error = git_repository_merge_cleanup(repo)) < 0) { giterr_set(GITERR_INDEX, "%s - Failed to clean up merge data.", ERROR_MSG); goto cleanup; } |