Merge pull request #42 from bith3ad/b4-compatible

Skip empty commits for umpf-tags
pengutronix · Jul 2, 2024 · c2580a2 · c2580a2
2 parents d905c70 + 96fe807
commit c2580a2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/umpf b/umpf
@@ -1083,7 +1083,7 @@ rebase_branch() {
 		if ${GIT} log --oneline "${base}..${topicrev}" | grep -q '\(amend\|fixup\|squash\)!'; then
 			args="-i --autosquash"
 		fi
-		if ! ${GIT} rebase -q ${args} --onto HEAD "${base}" "${topicrev}" >&2; then
+		if ! ${GIT} rebase -q ${args} --no-keep-empty --onto HEAD "${base}" "${topicrev}" >&2; then
 			if ! rebase_try_continue; then
 				bailout "rebase failed"
 			fi