On Sun, Jan 29, 2017 at 01:30:38PM +1100, Ben Finney wrote: > On 22-Jan-2017, Guido Günther wrote: > > Hi Ben, > > On Sun, Jan 22, 2017 at 03:48:47PM +1100, Ben Finney wrote: > > > Please merge from my ‘issue/802284-overlay-before-rules’ branch > > > <URL:https://notabug.org/bignose/debian_git-buildpackage/src/issue/802284-overlay-before-rules> > > > if you approve of the implementation. > > > > Thanks for updating this. I had a quick look and it seems your > > 820247ae963a37daea2b63dc067aacd2928 > > I couldn't find a commit with that hash. I think you probably mean > commit ‘abeec820247ae963a37daea2b63dc067aacd2928’. > > In response to your feedback I have re-based the branch, so that > difference is moot :-) > > > moves the check for uncommitted changes into > > if not options.tag_only: > > that means the test will be skipped when this options is set which > > is bad. > > Okay. I found that large function difficult to navigate; it is not > clear how to achieve the goal of that commit (“Only run the cleaner > command after exporting source tree.”) without just moving it to that > location. > > To tease apart the separate actions a little, I have extracted the > statements cleaning the working tree, to a separate function. Now the > change of when to do the clean is much simpler, see > <URL:https://notabug.org/bignose/debian_git-buildpackage/commit/df80f5e5efc1ec54694338b158983da9f9180c46>.
Moving the cleaning/checking part out of main is exactly what I had in mind (and so I already pulled that change in). If you now leave the check where it is for for all cases except *options.overlay and not options.tag_only) and have the check executed where you have it now for overlay-mode we have everything covered. If you supply the testcases for overlay mode I can handle the ones for tag-only so we spot and possible breackage. Cheers, -- Guido > > How would you like that commit to change so that the clean happens > when it should? > > -- > \ “I filled my humidifier with wax. Now my room is all shiny.” | > `\ —Steven Wright | > _o__) | > Ben Finney <b...@benfinney.id.au>
