utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 07:26:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

git-squash: clean up shellcheck warnings

Browse source
This commit is contained in:
spacewander 2019-11-05 10:30:37 +08:00
parent 1924eb9197
commit f4e313d3f2
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/git-squash
View file

@ -31,7 +31,8 @@ is_commit_reference() {
}
is_on_current_branch() {
local commit_sha=`git rev-parse "$src"`
local commit_sha
commit_sha=$(git rev-parse "$src")
git rev-list HEAD |
grep -q -- "$commit_sha"
}
@ -70,9 +71,9 @@ squash_current_branch() {
commit_if_msg_provided
}
if `is_branch`; then
if is_branch; then
squash_branch
elif `is_commit_reference` && `is_on_current_branch`; then
elif is_commit_reference && is_on_current_branch; then
squash_current_branch
else
echo "Source branch or commit reference required." 1>&2 && exit 1