Hi, Jordan, Yes, I did use "git commit --amend" to update my last patch. The missing part is subject change. I did not do "--subject-prefix="PATCH v2". So the only difference is in the subject of the patch and the diff will be the same. Please let me know if you want me to rename the subject.
Thanks Maurice -----Original Message----- From: Justen, Jordan L Sent: Friday, April 10, 2015 11:26 AM To: Ma, Maurice; edk2-devel@lists.sourceforge.net; Agyeman, Prince Subject: RE: [edk2] CorebootPayloadPkg: Remove empty folder reference in DEC file On 2015-04-10 11:11:51, Jordan Justen wrote: > On 2015-04-10 10:27:06, Ma, Maurice wrote: > > Hi, Jordan, > > > > Do you want a new v2 patch on top of my original v1 patch? > > v2 would refer to a replacement to your original patch. So, you would > amend the patch in git, Meaning 'git commit --amend' to update the last patch in the branch, or editing a patch with 'git rebase -i' to update a patch within a patch series. -Jordan > and then run > git format-patch --subject-prefix="PATCH v2" HEAD~ > > > I am trying to understand the general flow here. During the code > > review, if we receive some feedback, should we just modify/recreate > > the original v1 patch or generate a new patch v2 on top of the > > original v1 patch ? > > I think it depends on the feedback. This is a very simple, > non-controversial patch. Therefore, I think you could have just taken > my r-b along with the feedback and committed the change. > > For something more complicated, you should incorporate the feedback, > run format-patch like above and use git send-email to send the new > version of the patch (or patches in the case of a series). > > For simple cases like this, I think waiting for just one r-b is fine. > For something more complicated, it is better to give extra time for > more developers to get a chance to review. (1 day to weeks, depending > on the change.) > > -Jordan > > > -----Original Message----- > > From: Justen, Jordan L > > Sent: Friday, April 10, 2015 10:04 AM > > To: Ma, Maurice; edk2-devel@lists.sourceforge.net; Agyeman, Prince > > Subject: RE: [edk2] CorebootPayloadPkg: Remove empty folder > > reference in DEC file > > > > Since I suggested the tweak, I think it would have been okay to keep my r-b > > for v2, but... > > > > Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com> > > > > On 2015-04-10 07:57:18, Ma, Maurice wrote: > > > Yes, we can. Attached a new patch to remove the [Includes] section. > > > > > > In current CorebootPayloadPkg.dec an empty 'Include' directory is > > > listed in [includes] section. However, this empty directory will > > > not be mirrored into git repo. If the source tree is pulled from > > > git, the 'Include' empty folder will not exist and it will cause build > > > failure. > > > The fix is to remove the whole [Includes] section in the DEC file. > > > > > > Contributed-under: TianoCore Contribution Agreement 1.0 > > > Signed-off-by: Maurice Ma <maurice...@intel.com> > > > --- > > > CorebootPayloadPkg/CorebootPayloadPkg.dec | 3 --- > > > 1 file changed, 3 deletions(-) > > > > > > diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.dec > > > b/CorebootPayloadPkg/CorebootPayloadPkg.dec > > > index b70af18..54eb3d2 100644 > > > --- a/CorebootPayloadPkg/CorebootPayloadPkg.dec > > > +++ b/CorebootPayloadPkg/CorebootPayloadPkg.dec > > > @@ -20,9 +20,6 @@ > > > PACKAGE_GUID = 58ABC905-951E-472e-8590-77BA8A50BE63 > > > PACKAGE_VERSION = 0.1 > > > > > > -[Includes] > > > - Include > > > - > > > [LibraryClasses] > > > > > > [Guids] > > > -- > > > 1.8.3.1 > > > > > > > > > -Thanks > > > Maurice > > > -----Original Message----- > > > From: Justen, Jordan L > > > Sent: Thursday, April 09, 2015 11:42 PM > > > To: Ma, Maurice; edk2-devel@lists.sourceforge.net; Agyeman, Prince > > > Subject: Re: [edk2] CorebootPayloadPkg: Remove empty folder > > > reference in DEC file > > > > > > I assume you could remove the whole [Includes] section as well? > > > > > > Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com> > > > > > > On 2015-04-09 21:05:05, Ma, Maurice wrote: > > > > CorebootPayloadPkg: Remove empty folder reference in DEC file > > > > > > > > In current CorebootPayloadPkg.dec an empty 'Include' directory > > > > is listed in [includes] section. However, this empty directory > > > > will not be mirrored into git repo. If the source tree is pulled > > > > from git, the 'Include' empty folder will not exist and it will cause > > > > build failure. > > > > The fix is to remove the unused empty folder reference in the > > > > DEC file. > > > > > > > > Contributed-under: TianoCore Contribution Agreement 1.0 > > > > Signed-off-by: Maurice Ma <maurice...@intel.com> > > > > --- > > > > CorebootPayloadPkg/CorebootPayloadPkg.dec | 1 - > > > > 1 file changed, 1 deletion(-) > > > > > > > > diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.dec > > > > b/CorebootPayloadPkg/CorebootPayloadPkg.dec > > > > index b70af18..76a0bca 100644 > > > > --- a/CorebootPayloadPkg/CorebootPayloadPkg.dec > > > > +++ b/CorebootPayloadPkg/CorebootPayloadPkg.dec > > > > @@ -21,7 +21,6 @@ > > > > PACKAGE_VERSION = 0.1 > > > > > > > > [Includes] > > > > - Include > > > > > > > > [LibraryClasses] > > > > > > > > -- > > > > 1.8.3.1 ------------------------------------------------------------------------------ BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT Develop your own process in accordance with the BPMN 2 standard Learn Process modeling best practices with Bonita BPM through live exercises http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_ source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel