Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve bashit upgrade function git log and add missing popd #2139

Merged
merged 1 commit into from
Apr 6, 2022
Merged

Improve bashit upgrade function git log and add missing popd #2139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ function _bash-it-update-() {
DIFF=$(git diff --name-status)
if [[ -n "$DIFF" ]]; then
echo -e "Local changes detected in bash-it directory. Clean '$BASH_IT' directory to proceed.\n$DIFF"
popd > /dev/null || return
return 1
fi

Expand Down Expand Up @@ -334,7 +335,7 @@ function _bash-it-update-() {
log_color="%Cred"
fi

git log --format="${log_color}%h: %s (%an)" "${revision}"
git log --no-merges --format="${log_color}%h: %s (%an)" "${revision}"
echo ""

if [[ -n "${silent}" ]]; then
Expand Down