diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-22 10:40:23 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-22 10:40:23 -0400 |
| commit | 0ba4dca52625b54d6b741bd10dce5ef76ebbf1b8 (patch) | |
| tree | dfc1be8e3b7b1516eb7103aaecca7644cfc17d50 /src/repository.c | |
| parent | 091165c53b2bcd5d41fb71d43ed5a23a3d96bf5d (diff) | |
| download | libgit2-0ba4dca52625b54d6b741bd10dce5ef76ebbf1b8.tar.gz | |
git_cherry_pick -> git_cherrypick
Diffstat (limited to 'src/repository.c')
| -rw-r--r-- | src/repository.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/repository.c b/src/repository.c index e8d50aed3..4f7a5feab 100644 --- a/src/repository.c +++ b/src/repository.c @@ -1915,8 +1915,8 @@ int git_repository_state(git_repository *repo) state = GIT_REPOSITORY_STATE_MERGE; else if(git_path_contains_file(&repo_path, GIT_REVERT_HEAD_FILE)) state = GIT_REPOSITORY_STATE_REVERT; - else if(git_path_contains_file(&repo_path, GIT_CHERRY_PICK_HEAD_FILE)) - state = GIT_REPOSITORY_STATE_CHERRY_PICK; + else if(git_path_contains_file(&repo_path, GIT_CHERRYPICK_HEAD_FILE)) + state = GIT_REPOSITORY_STATE_CHERRYPICK; else if(git_path_contains_file(&repo_path, GIT_BISECT_LOG_FILE)) state = GIT_REPOSITORY_STATE_BISECT; @@ -1958,7 +1958,7 @@ static const char *state_files[] = { GIT_MERGE_MODE_FILE, GIT_MERGE_MSG_FILE, GIT_REVERT_HEAD_FILE, - GIT_CHERRY_PICK_HEAD_FILE, + GIT_CHERRYPICK_HEAD_FILE, GIT_BISECT_LOG_FILE, GIT_REBASE_MERGE_DIR, GIT_REBASE_APPLY_DIR, |