Hi Phillip, On Wed, 31 Jan 2018, Phillip Wood wrote: > On 31/01/18 13:21, Johannes Schindelin wrote: > > > > On Tue, 30 Jan 2018, Stefan Beller wrote: > > > >> On Mon, Jan 29, 2018 at 2:54 PM, Johannes Schindelin > >> <johannes.schindelin@xxxxxx> wrote: > >>> @@ -116,6 +118,13 @@ static GIT_PATH_FUNC(rebase_path_stopped_sha, "rebase-merge/stopped-sha") > >>> static GIT_PATH_FUNC(rebase_path_rewritten_list, "rebase-merge/rewritten-list") > >>> static GIT_PATH_FUNC(rebase_path_rewritten_pending, > >>> "rebase-merge/rewritten-pending") > >>> + > >>> +/* > >>> + * The path of the file listing refs that need to be deleted after the rebase > >>> + * finishes. This is used by the `merge` command. > >>> + */ > > > > Whoops. The comment "This is used by the `merge` command`" is completely > > wrong. Will fix. > > > >> So this file contains (label -> commit), > > > > Only `label`. No `commit`. > > > >> which is appended in do_label, it uses refs to store the commits in > >> refs/rewritten. We do not have to worry about the contents of that file > >> getting too long, or label re-use, because the directory containing all > >> these helper files will be deleted upon successful rebase in > >> `sequencer_remove_state()`. > > > > Yes. > > > It might be a good idea to have 'git rebase --abort' delete the refs as > well as the file though That makes sense. I made it so. Ciao, Dscho
