Hi Brian, On Wed, 30 May 2018, brian m. carlson wrote:
> On Wed, May 30, 2018 at 11:54:27AM +0200, Johannes Schindelin wrote: > > > > + third=$(git rev-parse HEAD) && > > > + git checkout -b labels master && > > > + git merge --no-commit third && > > > + test_tick && > > > + git commit -m "Merge commit '\''$third'\'' into labels" && > > > > Here, the test_tick is required because we commit via `git commit`. > > > > BTW another thing that I had been meaning to address but totally forgot is > > this '\'' ugliness. I had been meaning to define SQ="'" before all test > > cases and then use $SQ everywhere. Not your problem, though. > > > > > + cp script-from-scratch-orig script-from-scratch && > > > > There is nothing in that script that you need. Why not simply > > > > echo noop >script-from-scratch > > > > or if you care about the branch, > > > > echo reset $third >script-from-scratch > > That would be simpler. You read my mind: I needed some script to make > the sequence editor work, but anything would be fine. I would not go that far. Sometimes I wish I could read minds. More often, I am glad that I cannot. I simply guessed correctly in this case ;-) But yes, I think it would not only be simpler, but would also avoid the head-scratching why the earlier `cp script-from-scratch script-from-scratch-orig`, and it would also make it more robust to future changes (e.g. if somebody decides to move test cases around, or introduce prereqs that skip some). Ciao, Dscho
