Skip to content

G
git2
Unverified Commit cdcf5b9c by Edward Thomson Committed by GitHub
Options

rebase: formatting fixes

parent 8fa58818
Showing with 4 additions and 3 deletions
src/libgit2/rebase.c
...@@ -111,11 +111,12 @@ static int rebase_state_type( ...@@ -111,11 +111,12 @@ static int rebase_state_type(
if (git_fs_path_isdir(git_str_cstr(&path))) { if (git_fs_path_isdir(git_str_cstr(&path))) {
if (git_str_joinpath(&interactive_path, path.ptr, INTERACTIVE_FILE) < 0) if (git_str_joinpath(&interactive_path, path.ptr, INTERACTIVE_FILE) < 0)
return -1; return -1;
if (git_fs_path_isfile(interactive_path.ptr)) {
if (git_fs_path_isfile(interactive_path.ptr))
type = GIT_REBASE_INTERACTIVE; type = GIT_REBASE_INTERACTIVE;
} else { else
type = GIT_REBASE_MERGE; type = GIT_REBASE_MERGE;
}
goto done; goto done;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment