From: Phillip Wood Date: Tue, 25 Jun 2019 13:35:50 GMT Subject: Re: [PATCH v2 3/4] rebase: fix garbled progress display with '-x' Message-ID: In-Reply-To: Hi Dscho On 25/06/2019 12:38, Johannes Schindelin wrote: > Hi Phillip, > > On Tue, 25 Jun 2019, Phillip Wood wrote: > >> On 24/06/2019 19:39, SZEDER Gábor wrote: >>> On Wed, Jun 12, 2019 at 09:14:40PM +0200, Johannes Schindelin wrote: >> >>> The other yucks affect the following four tests in >>> 't3420-rebase-autostash.sh': >>> >>> 16 - rebase --merge --autostash: check output >>> 23 - rebase --merge: check output with conflicting stash >>> 26 - rebase --interactive --autostash: check output >>> 33 - rebase --interactive: check output with conflicting stash >>> >>> These tests come from commits b76aeae553 (rebase: add regression tests >>> for console output, 2017-06-19) and 7d70e6b902 (rebase: add more >>> regression tests for console output, 2017-06-19), and are specifically >>> about checking the (whole) console output of 'git rebase', so I left >>> the updates to them as they were. >>> >>> In any case, Cc-ing Phillip to discuss whether something could be done >>> about them (now perhaps preferably (for me :) as a follow-up, and not >>> another preparatory patches). >> >> Those tests were added to check that `git stash` was being silenced (see >> 79a6226981 ("rebase -i: silence stash apply", 2017-05-18)). I can have a >> think about a better way to do that, but is it still a problem? I just >> tried to take a look at your CI output and >> https://dev.azure.com/gitgitgadget/git/_build/results?buildId=11406 >> seems to be all green - have I missed something or has Gábor fixed the >> issue? > > AFAIU the test cases were patched to accommodate for the new output. > Ideally, they would be changed to not need any changes in the future, > certainly not to accommodate changes in unrelated areas (such as the > progress). > > So yes, the build is green, and the patches are probably good to go, but > there is room for add-on patches to clean up the test cases to test > succinctly what they are supposed to test. Thanks, I'd missed the point entirely! As I said in my reply to Gábor, I think testing the whole output does have some use, but I can see that it would be very good to get rid of the whole Q thing Best Wishes Phillip > > Ciao, > Dscho >