diff options
| author | dundargoc <gocdundar@gmail.com> | 2023-10-23 21:03:15 +0200 |
|---|---|---|
| committer | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-10-23 21:48:06 +0200 |
| commit | 25cfe3fd432d77689446fe5a0bb972479298387c (patch) | |
| tree | a3d00595652aa4c83003cd1bdd567a02cc8564fc /cmake | |
| parent | 5f03a1eaabfc8de2b3a9c666fcd604763f41e152 (diff) | |
| download | rneovim-25cfe3fd432d77689446fe5a0bb972479298387c.tar.gz rneovim-25cfe3fd432d77689446fe5a0bb972479298387c.tar.bz2 rneovim-25cfe3fd432d77689446fe5a0bb972479298387c.zip | |
build: enable formatting during rebase
Closes https://github.com/neovim/neovim/issues/25654
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Format.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/Format.cmake b/cmake/Format.cmake index 7e8ca3547d..7097e5766f 100644 --- a/cmake/Format.cmake +++ b/cmake/Format.cmake @@ -1,15 +1,13 @@ # Returns a list of all files that has been changed in current branch compared # to master branch. This includes unstaged, staged and committed files. function(get_changed_files outvar) - set(default_branch master) - execute_process( COMMAND git branch --show-current OUTPUT_VARIABLE current_branch OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process( - COMMAND git merge-base ${default_branch} ${current_branch} + COMMAND git merge-base master HEAD OUTPUT_VARIABLE ancestor_commit OUTPUT_STRIP_TRAILING_WHITESPACE) |