On Wed, May 30, 2018 at 11:54:27AM +0200, Johannes Schindelin wrote: > > + git checkout -b third B && > > + test_tick && > > + test_commit I && > > The test_tick before test_commit is unnecessary. You're right, it is. Will fix. > > + 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. > > + test_config sequence.editor \""$PWD"/replace-editor.sh\" && > > + test_tick && > > + git rebase -i -r A && > > + ! grep "^label $third$" .git/ORIGINAL-TODO > > I would like to verify in addition that /^label $third-/ is present in > ORIGINAL-TODO, what do you think? Sure, I can do that. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204
Attachment:
signature.asc
Description: PGP signature
