From 6ccd9f5adfde535341da8139a156ef05de6568c9 Mon Sep 17 00:00:00 2001 From: Gurkirat Singh Date: Mon, 21 Mar 2022 08:52:46 +0530 Subject: [PATCH] fix (helpers): bashit_update function return to source path and --no-merges in log --- lib/helpers.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/helpers.bash b/lib/helpers.bash index c0ce2eb3e2..2ee43a17af 100644 --- a/lib/helpers.bash +++ b/lib/helpers.bash @@ -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 @@ -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