Merge pull request #2139 from tbhaxor/patch-3

Improve bashit upgrade function git log and add missing popd
Bash-it · Apr 6, 2022 · b950941 · b950941
2 parents 1ffbc85 + 6ccd9f5
commit b950941
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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