Skip to content

Commit cfc6eb9

Browse files
committed
bin/git-review: Fix save
1 parent 990b70a commit cfc6eb9

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

bin/git-review

+19-7
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ auto_calculate_args() {
9595
checkpoint_file="$git_dir/review/checkpoints/${pr_branch//\//%}"
9696

9797
if [[ -z "$from_checkpoint" ]] && [[ -f "$checkpoint_file" ]]; then
98-
from_checkpoint="$(cat "$checkpoint_file" | tail -n 1)"
98+
from_checkpoint="$(get_last_checkpoint)"
9999
fi
100100

101101
if [[ "$local_branch" == 'true' ]]; then
@@ -146,16 +146,20 @@ exec_reset_checkpoint() {
146146
}
147147

148148
exec_save_checkpoint() {
149-
if ! has_changes; then
150-
info 'No changes to save.'
151-
exit 0
149+
if has_changes; then
150+
git status
151+
152+
git commit -m "Reviewed (from checkpoint $from_checkpoint)"
152153
fi
153154

154-
git status
155+
new_checkpoint="$(git rev-parse --verify HEAD)"
156+
last_checkpoint="$(get_last_checkpoint)"
155157

156-
git commit -m "Reviewed (from checkpoint $from_checkpoint)"
158+
if [[ "$new_checkpoint" == "$last_checkpoint" ]]; then
159+
info 'No changes to save.'
160+
exit 0
161+
fi
157162

158-
new_checkpoint="$(git rev-parse --verify HEAD)"
159163
mkdir -p "$(dirname "$checkpoint_file")"
160164
echo "$new_checkpoint" >> "$checkpoint_file"
161165
info "Saved checkpoint '$new_checkpoint' to '$checkpoint_file'."
@@ -226,4 +230,12 @@ exec_update() {
226230
exit 0
227231
}
228232

233+
get_last_checkpoint() {
234+
if ! [[ -f "$checkpoint_file" ]]; then
235+
fail 'No checkpoint file.'
236+
fi
237+
238+
cat "$checkpoint_file" | tail -n 1
239+
}
240+
229241
main "$@"

config/vscode/User/settings.json

+1
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@
285285
"cmake",
286286
"cyclomatic",
287287
"datefmt",
288+
"descendency",
288289
"dotfiles",
289290
"dtype",
290291
"eventhub",

0 commit comments

Comments
 (0)