diff options
| author | Teddy Wing | 2023-11-24 21:06:46 +0100 |
|---|---|---|
| committer | Teddy Wing | 2023-11-24 21:06:46 +0100 |
| commit | 7232165a08aeb511970b5876c6ea13ee443bfe4d (patch) | |
| tree | 5684757cd8466d276dda8c018fb5f8721544f67b | |
| parent | bc44e15843b4346c278a1cb169eb8aba81717275 (diff) | |
| download | code-review-7232165a08aeb511970b5876c6ea13ee443bfe4d.tar.bz2 | |
code-review-changed-files: Move "..." back to `get_merge_base`
It's more convenient to have the "..." here because all of the
code-review commands use `get_merge_base`. Otherwise I'd end up having
to add it to most of the other commands.
But now, instead of only adding it to the default merge base, add it to
all merge bases, including the one set by `code-review-start`. This
makes all merge bases consistent, and means you don't have to include
the dots when setting a custom merge base.
| -rwxr-xr-x | code-review-changed-files | 2 | ||||
| -rw-r--r-- | code-review-database | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/code-review-changed-files b/code-review-changed-files index 1d55d86..8413b47 100755 --- a/code-review-changed-files +++ b/code-review-changed-files @@ -21,5 +21,5 @@ SCRIPT="$(dirname "$0")" source "$SCRIPT/code-review-database" -git diff --name-only "$(get_merge_base)"... | +git diff --name-only "$(get_merge_base)" | awk -v git_root="$GIT_ROOT" '{ print git_root "/" $0 }' diff --git a/code-review-database b/code-review-database index a1cd739..51c70ef 100644 --- a/code-review-database +++ b/code-review-database @@ -73,7 +73,7 @@ function get_merge_base () { local default_base='master' if [ -n "$CODE_REVIEW_BASE" ]; then - echo "$CODE_REVIEW_BASE" + echo "$CODE_REVIEW_BASE"... return 0 fi @@ -84,7 +84,7 @@ function get_merge_base () { sqlite3 "$DATABASE" <<-SQL BEGIN TRANSACTION; - SELECT ifnull(max(base), '$default_base') + SELECT ifnull(max(base), '$default_base') || '...' FROM merge_bases WHERE head = '$head' LIMIT 1; |