XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2139 from tbhaxor/patch-3 

Improve bashit upgrade function git log and add missing popd
pull/2079/merge
Noah Gorny 2022-04-06 23:06:52 +03:00 committed by GitHub
parent 1ffbc85a62 6ccd9f5adf
commit b95094153f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/helpers.bash
View File

@ -290,6 +290,7 @@ function _bash-it-update-() {
DIFF=$(git diff --name-status) DIFF=$(git diff --name-status)
if [[ -n "$DIFF" ]]; then if [[ -n "$DIFF" ]]; then
echo -e "Local changes detected in bash-it directory. Clean '$BASH_IT' directory to proceed.\n$DIFF" echo -e "Local changes detected in bash-it directory. Clean '$BASH_IT' directory to proceed.\n$DIFF"
popd > /dev/null || return
return 1 return 1
fi fi
@ -334,7 +335,7 @@ function _bash-it-update-() {
log_color="%Cred" log_color="%Cred"
fi fi
git log --format="${log_color}%h: %s (%an)" "${revision}" git log --no-merges --format="${log_color}%h: %s (%an)" "${revision}"
echo "" echo ""
if [[ -n "${silent}" ]]; then if [[ -n "${silent}" ]]; then