diff options
| author | Teddy Wing | 2019-06-17 20:05:47 +0200 |
|---|---|---|
| committer | Teddy Wing | 2019-06-17 20:05:47 +0200 |
| commit | 42215fe2bbefba19308bd879f6507123d53d1fe1 (patch) | |
| tree | 8d0a6fe8d3de61fbb7b29ddaa40aa309a3ccf39b /code-review-database | |
| parent | 87b53c3468625eab072dbd80e983eb3b364d4a10 (diff) | |
| download | code-review-42215fe2bbefba19308bd879f6507123d53d1fe1.tar.bz2 | |
get_merge_base(): Change default base to `master...`
Add the range filter to try to remove commits that we don't care about.
Still not sure if this will work in all cases, as sometimes `..` seemed
to give me the right collection of files and sometimes `...` did.
code-review-difftool:
Pass the merge base without range dots (`..` or `...`) to Vim Fugitive,
as it doesn't accept revisions with ranges. Not sure what to do if I get
a range with two revision names yet, though.
Turns on Bash's `extglob` in order to use `?(...)` to include both
patterns in the expansion.
Diffstat (limited to 'code-review-database')
| -rw-r--r-- | code-review-database | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/code-review-database b/code-review-database index 5c931c6..3c3a1ee 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 |