From 9afec6570dd9795aeb720678cd3b2286d3998a13 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Fri, 24 Nov 2023 20:44:18 +0100 Subject: code-review-database: Remove "..." from merge base I don't think this is the right approach, but since I added the "..." in `code-review-changed-files` in 7659cf07f118fec4c1ba9677c82a7ef61511e797, removing the "..." from here allows the difftool script to work when using the default merge base. --- code-review-database | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code-review-database b/code-review-database index 3c3a1ee..5c931c6 100644 --- a/code-review-database +++ b/code-review-database @@ -70,10 +70,10 @@ function create_merge_base_from_current () { function get_merge_base () { local head="$(current_branch)" - local default_base='master...' + local default_base='master' if git config remote.origin.url > /dev/null; then - default_base='origin/master...' + default_base='origin/master' fi sqlite3 "$DATABASE" <<-SQL -- cgit v1.2.3