diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2022-07-06 23:19:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-06 23:19:28 -0400 |
| commit | cdcf5b9ca2396f7741bede6f0eda78c5aaa54ae7 (patch) | |
| tree | 1b67fb20c79222112b9d7df040f4517a682dbd5a | |
| parent | 8fa58818859e8afaa2143fa222e6aedccaf86df9 (diff) | |
| download | libgit2-cdcf5b9ca2396f7741bede6f0eda78c5aaa54ae7.tar.gz | |
rebase: formatting fixes
| -rw-r--r-- | src/libgit2/rebase.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libgit2/rebase.c b/src/libgit2/rebase.c index c3acfd52c..5e48f0dfb 100644 --- a/src/libgit2/rebase.c +++ b/src/libgit2/rebase.c @@ -111,11 +111,12 @@ static int rebase_state_type( if (git_fs_path_isdir(git_str_cstr(&path))) { if (git_str_joinpath(&interactive_path, path.ptr, INTERACTIVE_FILE) < 0) return -1; - if (git_fs_path_isfile(interactive_path.ptr)) { + + if (git_fs_path_isfile(interactive_path.ptr)) type = GIT_REBASE_INTERACTIVE; - } else { + else type = GIT_REBASE_MERGE; - } + goto done; } |