{"thread":{"id":"7648","subject":"git-quiltimport complaining yet still working","startedAt":"2007-04-13T20:38:37Z","lastAt":"2007-04-14T03:57:26Z","messageCount":6,"participants":["Greg KH","Don Zickus","Linus Torvalds","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"39308","messageId":"20070413203837.GA27660@kroah.com","threadId":"7648","inReplyTo":null,"subject":"git-quiltimport complaining yet still working","fromName":"Greg KH","fromEmail":"greg@kroah.com","sentAt":"2007-04-13T20:38:37Z","receivedAt":"2007-04-13T20:38:37Z","isPatch":false,"sender":{"key":"greg@kroah.com","avatar":"https://gravatar.com/avatar/5bb5aa0cc2e01c00ec899d11130c07796bc186e465bae57bc34873b13b72c7c8?d=mp&s=160"},"body":"In git 1.5.1 the quiltimport function started complaining in a new way:\n\n\tlibata-clear-tf-before-doing-request-sense.patch\n\tPatch is empty.  Was is split wrong?\n\t/usr/bin/git-quiltimport: line 78: stop_here: command not found\n\nyet it still applies the patch properly.\n\nFor an example of patches that causes this output, the -stable kernel\ntree queue can be used (which is where I started seeing this problem...)\n\nAny hints?  Or is it time to start bisecting?\n\nthanks,\n\ngreg k-h\n"},{"id":"39309","messageId":"68948ca0704131413t687c7196h70c6cc8c316b640e@mail.gmail.com","threadId":"7648","inReplyTo":"20070413203837.GA27660@kroah.com","subject":"Re: git-quiltimport complaining yet still working","fromName":"Don Zickus","fromEmail":"dzickus@gmail.com","sentAt":"2007-04-13T21:13:58Z","receivedAt":"2007-04-13T21:13:58Z","isPatch":false,"sender":{"key":"dzickus@gmail.com","avatar":"https://gravatar.com/avatar/fbc96d0d5584c05dec11867b861650fe9f5d7d0ddec2655a1f90542fe07d9769?d=mp&s=160"},"body":"On 4/13/07, Greg KH <greg@kroah.com> wrote:\n> In git 1.5.1 the quiltimport function started complaining in a new way:\n>\n>         libata-clear-tf-before-doing-request-sense.patch\n>         Patch is empty.  Was is split wrong?\n>         /usr/bin/git-quiltimport: line 78: stop_here: command not found\n\nSorry about that.  I assumed all the scripts using git-mailinfo had\nthe stop_here command.  Not sure why I made that assumption.\n\nI changed the behaviour of git-mailinfo to allow empty patches and\nhave the scripts check if a patch was empty and fail.  Unfortunately,\nI incorrectly applied the change to git-quiltimport.\n\nAnyway the following should fix it.\n\nSigned-off-by: Don Zickus <dzickus@redhat.com>\n\n\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex edccd82..0d20dc5 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -75,7 +75,7 @@ for patch_name in $(cat \"$QUILT_PATCHES/series\" | grep -v '^#'); do\n \t(cat $QUILT_PATCHES/$patch_name | git-mailinfo \"$tmp_msg\" \"$tmp_patch\" > \"$tmp_info\") || exit 3\n \ttest -s $dotest/patch || {\n \t\techo \"Patch is empty.  Was is split wrong?\"\n-\t\tstop_here $this\n+\t\texit 3\n \t}\n \n \t# Parse the author information\n"},{"id":"39310","messageId":"20070413211913.GA7134@kroah.com","threadId":"7648","inReplyTo":"68948ca0704131413t687c7196h70c6cc8c316b640e@mail.gmail.com","subject":"Re: git-quiltimport complaining yet still working","fromName":"Greg KH","fromEmail":"greg@kroah.com","sentAt":"2007-04-13T21:19:13Z","receivedAt":"2007-04-13T21:19:13Z","isPatch":false,"sender":{"key":"greg@kroah.com","avatar":"https://gravatar.com/avatar/5bb5aa0cc2e01c00ec899d11130c07796bc186e465bae57bc34873b13b72c7c8?d=mp&s=160"},"body":"On Fri, Apr 13, 2007 at 05:13:58PM -0400, Don Zickus wrote:\n> On 4/13/07, Greg KH <greg@kroah.com> wrote:\n> >In git 1.5.1 the quiltimport function started complaining in a new way:\n> >\n> >        libata-clear-tf-before-doing-request-sense.patch\n> >        Patch is empty.  Was is split wrong?\n> >        /usr/bin/git-quiltimport: line 78: stop_here: command not found\n> \n> Sorry about that.  I assumed all the scripts using git-mailinfo had\n> the stop_here command.  Not sure why I made that assumption.\n> \n> I changed the behaviour of git-mailinfo to allow empty patches and\n> have the scripts check if a patch was empty and fail.  Unfortunately,\n> I incorrectly applied the change to git-quiltimport.\n> \n> Anyway the following should fix it.\n> \n> Signed-off-by: Don Zickus <dzickus@redhat.com>\n\n> diff --git a/git-quiltimport.sh b/git-quiltimport.sh\n> index edccd82..0d20dc5 100755\n> --- a/git-quiltimport.sh\n> +++ b/git-quiltimport.sh\n> @@ -75,7 +75,7 @@ for patch_name in $(cat \"$QUILT_PATCHES/series\" | grep -v '^#'); do\n>  \t(cat $QUILT_PATCHES/$patch_name | git-mailinfo \"$tmp_msg\" \"$tmp_patch\" > \"$tmp_info\") || exit 3\n>  \ttest -s $dotest/patch || {\n>  \t\techo \"Patch is empty.  Was is split wrong?\"\n> -\t\tstop_here $this\n> +\t\texit 3\n\nAre you sure?  This will exit, and yet, there was nothing really wrong\nwith the patch in the first place (as proven by the fact that it is\napplied properly.)\n\nOr did the patch format that can be accepted by git-quiltimport suddenly\nchange somehow?  I'm passing mbox-like files to it, and have been since\nit was created.  To change this, is fine, but let me know what format\nis now needed please.\n\nthanks,\n\ngreg k-h\n"},{"id":"39313","messageId":"Pine.LNX.4.64.0704131431040.28042@woody.linux-foundation.org","threadId":"7648","inReplyTo":"20070413203837.GA27660@kroah.com","subject":"Re: git-quiltimport complaining yet still working","fromName":"Linus Torvalds","fromEmail":"torvalds@linux-foundation.org","sentAt":"2007-04-13T21:34:18Z","receivedAt":"2007-04-13T21:34:18Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Fri, 13 Apr 2007, Greg KH wrote:\n>\n> In git 1.5.1 the quiltimport function started complaining in a new way:\n> \n> \tlibata-clear-tf-before-doing-request-sense.patch\n> \tPatch is empty.  Was is split wrong?\n> \t/usr/bin/git-quiltimport: line 78: stop_here: command not found\n\nThis is an *old* bug. It got fixed once already. Did it get re-introduced?\n\nAhh - somebody copied the bug from git-applymbox\n\n> Any hints?  Or is it time to start bisecting?\n\nThis should fix it.\n\nThere were two bugs: \"stop_here\" doesn't exist, but the bug that causes \nthis code to trigger in the *first* place is the wrong use of \"$dotest\". \nIt should be \".dotest\"\n\n\t\tLinus\n\n---\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex edccd82..018cc75 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -73,9 +73,9 @@ mkdir $tmp_dir || exit 2\n for patch_name in $(cat \"$QUILT_PATCHES/series\" | grep -v '^#'); do\n \techo $patch_name\n \t(cat $QUILT_PATCHES/$patch_name | git-mailinfo \"$tmp_msg\" \"$tmp_patch\" > \"$tmp_info\") || exit 3\n-\ttest -s $dotest/patch || {\n+\ttest -s .dotest/patch || {\n \t\techo \"Patch is empty.  Was is split wrong?\"\n-\t\tstop_here $this\n+\t\texit 1\n \t}\n \n \t# Parse the author information\n"},{"id":"39316","messageId":"7vodlrc2vt.fsf@assigned-by-dhcp.cox.net","threadId":"7648","inReplyTo":"Pine.LNX.4.64.0704131431040.28042@woody.linux-foundation.org","subject":"Re: git-quiltimport complaining yet still working","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-04-13T22:42:46Z","receivedAt":"2007-04-13T22:42:46Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Linus Torvalds <torvalds@linux-foundation.org> writes:\n\n> This should fix it.\n>\n> There were two bugs: \"stop_here\" doesn't exist, but the bug that causes \n> this code to trigger in the *first* place is the wrong use of \"$dotest\". \n> It should be \".dotest\"\n\nI am quite sure that I've said the same thing as above in my\nearlier message to fix this exact thing, but as usual I appear\nto have sent it to the list and then forgot to apply it myself.\n\nThanks.\n"},{"id":"39320","messageId":"20070414035726.GA6488@kroah.com","threadId":"7648","inReplyTo":"Pine.LNX.4.64.0704131431040.28042@woody.linux-foundation.org","subject":"Re: git-quiltimport complaining yet still working","fromName":"Greg KH","fromEmail":"greg@kroah.com","sentAt":"2007-04-14T03:57:26Z","receivedAt":"2007-04-14T03:57:26Z","isPatch":false,"sender":{"key":"greg@kroah.com","avatar":"https://gravatar.com/avatar/5bb5aa0cc2e01c00ec899d11130c07796bc186e465bae57bc34873b13b72c7c8?d=mp&s=160"},"body":"On Fri, Apr 13, 2007 at 02:34:18PM -0700, Linus Torvalds wrote:\n> \n> \n> On Fri, 13 Apr 2007, Greg KH wrote:\n> >\n> > In git 1.5.1 the quiltimport function started complaining in a new way:\n> > \n> > \tlibata-clear-tf-before-doing-request-sense.patch\n> > \tPatch is empty.  Was is split wrong?\n> > \t/usr/bin/git-quiltimport: line 78: stop_here: command not found\n> \n> This is an *old* bug. It got fixed once already. Did it get re-introduced?\n> \n> Ahh - somebody copied the bug from git-applymbox\n> \n> > Any hints?  Or is it time to start bisecting?\n> \n> This should fix it.\n> \n> There were two bugs: \"stop_here\" doesn't exist, but the bug that causes \n> this code to trigger in the *first* place is the wrong use of \"$dotest\". \n> It should be \".dotest\"\n\nThanks, that seems to do the trick for me.\n\ngreg k-h\n"}]}