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

fix (helpers): bashit_update function return to source path and --no-merges in log

Browse Source
This commit is contained in:
Gurkirat Singh
2022-03-21 08:52:46 +05:30
committed by GitHub
parent 1ffbc85a62
commit 6ccd9f5adf
1 changed files with 2 additions and 1 deletions
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