From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2024 21:27:35 +0000 (-0700)
Subject: Meta/Reintegrate: allow 'pick' to be empty
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b82ae443e1c2514821432d6e58aa81e9a9963ce;p=thirdparty%2Fgit.git

Meta/Reintegrate: allow 'pick' to be empty
---

diff --git a/Reintegrate b/Reintegrate
index cb5040405b..cf74e4394f 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -288,7 +288,7 @@ no)
 
 			mark_cut
 
-			git cherry-pick "$branch" || leave $? ;;
+			git cherry-pick --allow-empty "$branch" || leave $? ;;
 		*) echo >&2 "Eh? $branch $eh"; leave $? ;;
 		esac