Re: [PATCH v2 02/10] sequencer: introduce new commands to reset therevision
- From
- Phillip Wood <phillip.wood@talktalk.net>
- Date
- Jan 31, 2018, 18:02 UTC
- Message-ID
- <cba8d5dc-f42d-8412-c471-edb5a860b3ae@talktalk.net>
- In-Reply-To
- <nycvar.QRO.7.76.6.1801311411040.35@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
On 31/01/18 13:21, Johannes Schindelin wrote:
Show 32 quoted lines
> > Hi Stefan, > > On Tue, 30 Jan 2018, Stefan Beller wrote: > >> On Mon, Jan 29, 2018 at 2:54 PM, Johannes Schindelin >> <johannes.schindelin@gmx.de> 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
Best Wishes
Phillip