Re: [PATCH] sequencer: ensure labels that are object IDs are rewritten

2018-05-31 Thread Johannes Schindelin
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

Re: [PATCH] sequencer: ensure labels that are object IDs are rewritten

2018-05-30 Thread brian m. carlson
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

Re: [PATCH] sequencer: ensure labels that are object IDs are rewritten

2018-05-30 Thread Johannes Schindelin
Hi Brian, On Tue, 29 May 2018, brian m. carlson wrote: > When writing the todo script for --rebase-merges, we try to find a label > for certain commits. If the label ends up being a valid object ID, such > as when we merge a detached commit, we want to rewrite it so it is no > longer a valid

[PATCH] sequencer: ensure labels that are object IDs are rewritten

2018-05-29 Thread brian m. carlson
When writing the todo script for --rebase-merges, we try to find a label for certain commits. If the label ends up being a valid object ID, such as when we merge a detached commit, we want to rewrite it so it is no longer a valid object ID. However, the code path that does this checks for its