# "Patch is empty. Was is split wrong?" 3 messages from 2007-03-17 to 2007-03-17. Participants: Linus Torvalds, Junio C Hamano. Thread: https://gitlist.dev/t/7283 ## Linus Torvalds, 2007-03-17 02:26 Subject: "Patch is empty. Was is split wrong?" Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0703161925190.3910%40woody.linux-foundation.org ``` My usage of "git-applymbox -u" these days always results in these bogus warnings: Patch is empty. Was is split wrong? /home/torvalds/bin/git-applymbox: line 82: stop_here: command not found but then it applies the patch anyway. Hmm? I've not looked into it any more yet. Linus ``` ## Junio C Hamano, 2007-03-17 03:54 Subject: Re: "Patch is empty. Was is split wrong?" Message-ID: <7v3b44v825.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v3b44v825.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` Linus Torvalds writes: > My usage of "git-applymbox -u" these days always results in these bogus > warnings: > > Patch is empty. Was is split wrong? > /home/torvalds/bin/git-applymbox: line 82: stop_here: command not found > > but then it applies the patch anyway. > > Hmm? I've not looked into it any more yet. Sounds like two new bugs from the mailinfo series we added last week, primarily 87ab7992 and f0658cf2. I suspect mailinfo thinks there is an empty patch (which may be one bug), and the change to applymbox tries to catch it, but there is no corresponding stop_here shell function defined as in git-am and barfs (which would be another bug). A fix for the latter bug would be the attached, and that would expose the former bug-suspect which may indicate you indeed have a non-patch in your mailbox (in which case there is no bug) or the updated mailinfo is misidentifying something as a non-patch (which would be a bug). diff --git a/git-applymbox.sh b/git-applymbox.sh index 2cbdc7e..c8637a8 100755 --- a/git-applymbox.sh +++ b/git-applymbox.sh @@ -79,7 +79,7 @@ do .dotest/msg .dotest/patch <$i >.dotest/info || exit 1 test -s $dotest/patch || { echo "Patch is empty. Was is split wrong?" - stop_here $this + exit 1 } git-stripspace < .dotest/msg > .dotest/msg-clean ;; ``` ## Junio C Hamano, 2007-03-17 04:19 Subject: Re: "Patch is empty. Was is split wrong?" Message-ID: <7vy7lwtsbl.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vy7lwtsbl.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <7v3b44v825.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano writes: > Linus Torvalds writes: > >> My usage of "git-applymbox -u" these days always results in these bogus >> warnings: >> >> Patch is empty. Was is split wrong? >> /home/torvalds/bin/git-applymbox: line 82: stop_here: command not found >> >> but then it applies the patch anyway. >> >> Hmm? I've not looked into it any more yet. > > Sounds like two new bugs from the mailinfo series we added last > week, primarily 87ab7992 and f0658cf2. Sheesh. Sorry, for a false patch. Here is a fix (will do this on 'master' tonight). diff --git a/git-applymbox.sh b/git-applymbox.sh index 2cbdc7e..3efd6a7 100755 --- a/git-applymbox.sh +++ b/git-applymbox.sh @@ -77,9 +77,9 @@ do *) git-mailinfo $keep_subject $utf8 \ .dotest/msg .dotest/patch <$i >.dotest/info || exit 1 - test -s $dotest/patch || { + test -s .dotest/patch || { echo "Patch is empty. Was is split wrong?" - stop_here $this + exit 1 } git-stripspace < .dotest/msg > .dotest/msg-clean ;; ```