On Tue, Aug 18, 2020 at 11:05 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > "Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > > From: Han-Wen Nienhuys <hanwen@xxxxxxxxxx> > > > > Check for existence and delete CHERRY_PICK_HEAD through ref functions. > > This will help cherry-pick work with alternate ref storage backends. > > These two sentences are true, but this patch does another thing that > is not advertised here. It stops recommending removal of > CHERRY_PICK_HEAD from the filesystem with "rm" (or using "git > update-ref -d" for that matter) as a way to avoid recording the > current commit as a cherry-pick. .. > Does "git cherry-pick --abort" only remove CHERRY_PICK_HEAD without > doing any other damage to the working tree files and to the index? Good catch. I just added cherry-pick --abort without much thinking. I reverted to update-ref -d which should be equivalent to what is currently recommended. -- Han-Wen Nienhuys - Google Munich I work 80%. Don't expect answers from me on Fridays. -- Google Germany GmbH, Erika-Mann-Strasse 33, 80636 Munich Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Paul Manicle, Halimah DeLaine Prado
