diff options
author | Teddy Wing | 2019-06-10 02:21:02 +0200 |
---|---|---|
committer | Teddy Wing | 2019-06-10 02:21:02 +0200 |
commit | 8398cee3460e1f6343d41323e851e99d8a0ed315 (patch) | |
tree | 6fdf0779d0f10c348732c8e35bbe295b6eee0e79 | |
parent | 21534162124501f0410ee31cd31130aa3b92a9f3 (diff) | |
download | code-review-8398cee3460e1f6343d41323e851e99d8a0ed315.tar.bz2 |
Use `get_merge_base` across scripts
Replace `$ARGS` system from before with the merge base value taken from
the database. This makes the merge base consistent across `code-review`
tools/subcommands.
-rwxr-xr-x | code-review-commits | 8 | ||||
-rwxr-xr-x | code-review-diff | 8 | ||||
-rwxr-xr-x | code-review-difftool | 10 | ||||
-rwxr-xr-x | code-review-stat | 8 |
4 files changed, 14 insertions, 20 deletions
diff --git a/code-review-commits b/code-review-commits index 10b03c6..45db156 100755 --- a/code-review-commits +++ b/code-review-commits @@ -1,9 +1,7 @@ #!/bin/sh -ARGS='master..' +SCRIPT="$(dirname "$0")" +source "$SCRIPT/code-review-database" -if [ "$#" -gt 0 ]; then - ARGS="$@" -fi -git log --oneline "$@" +git log --oneline "$(get_merge_base)" diff --git a/code-review-diff b/code-review-diff index 37c6cb2..fe16e07 100755 --- a/code-review-diff +++ b/code-review-diff @@ -1,9 +1,7 @@ #!/bin/sh -ARGS='master..' +SCRIPT="$(dirname "$0")" +source "$SCRIPT/code-review-database" -if [ "$#" -gt 0 ]; then - ARGS="$@" -fi -git diff "$ARGS" +git diff "$(get_merge_base)" diff --git a/code-review-difftool b/code-review-difftool index 54376c4..1d3dcb8 100755 --- a/code-review-difftool +++ b/code-review-difftool @@ -1,12 +1,12 @@ #!/usr/bin/env bash -REVIEW_BASE=master.. +SCRIPT="$(dirname "$0")" +source "$SCRIPT/code-review-database" -if [ $# -gt 1 ]; then - REVIEW_BASE="$1" -fi + +review_base="$(get_merge_base)" # TODO: Use `code-review-changed-files` instead of `git diff --name-only` # TODO: Can't replace single dots as those could be part of a branch name # vim -c 'tabdo Gdiff ${REVIEW_BASE/./}' -p $(git diff --name-only "$REVIEW_BASE") -vim -c 'tabdo Gdiff origin/master' -p $(git diff --name-only origin/master) +vim -c "tabdo Gdiff $review_base" -p $(git diff --name-only $review_base) diff --git a/code-review-stat b/code-review-stat index 61f58ed..a3ca472 100755 --- a/code-review-stat +++ b/code-review-stat @@ -1,9 +1,7 @@ #!/bin/sh -ARGS='master..' +SCRIPT="$(dirname "$0")" +source "$SCRIPT/code-review-database" -if [ "$#" -gt 0 ]; then - ARGS="$@" -fi -git diff --stat "$ARGS" +git diff --stat "$(get_merge_base)" |