On 04/11, Thomas Gummerer wrote: > On 04/09, Eric Sunshine wrote: > > On Mon, Apr 9, 2018 at 3:30 PM, Thomas Gummerer <t.gumme...@gmail.com> > > wrote: > > > On 04/08, Eric Sunshine wrote: > > >> As with Junio, I'm fine with this hidden option (for now), however, I > > >> think you can take this a step further. Rather than having a (hidden) > > >> git-reset option which suppresses "HEAD is now at...", instead have a > > >> (hidden) option which augments the message. For example, > > >> --new-head-desc="New worktree" would make it output "New worktree HEAD > > >> is now at...". Changes to builtin/reset.c to support this would hardly > > >> be larger than the changes you already made. > > > > > > Something else I just noticed that may make this a worse solution is > > > that this breaks the sentence in two pieces for translators. I guess > > > we could somehow get the "New worktree" part of the option translated, > > > but that still means that if some language would require to move parts > > > of the sentence around that would be less than ideal for translation. > > > > Good point. > > > > One solution would be to have the new hidden option replace the string > > entirely: --new-head-msg="New worktree HEAD is now at %s", which would > > allow translators to deal with the entire sentence. Even clearer would > > be to drop "now", as in "New worktree HEAD is at %s". (Default in > > reset.c would still be "HEAD is now at %s", of course.) > > > > Another solution would be not to augment the "HEAD is now at..." > > message at all. I realize that that augmentation was one of the > > original motivations for this patch series, but with the upcoming > > restoration of the "Preparing worktree" message: > > My original motivation of the series was to just make the new dwim > work :) Because that's adding some magic, the secondary motivation > became improving the UI, to help users see which dwim was used. I > felt like this was going to be one of those improvements, especially > after we get rid of the "Preparing ..." line. > > I do however like your suggestion of the "Preparing worktree (_branch > disposition_)", as that doesn't add more lines to the output, while > still giving a good indication of what exactly is happening. At that > point just showing "HEAD is now at ..." is fine by me, and doesn't > require adding the hidden flag to 'git reset'. So I'm happy just > dropping the change in the message here, which will simplify things.
And just as I'm re-reading my commit messages, I guess there was one more motivation for printing the "HEAD is now at ..." line ourselves: If the '--no-checkout' flag is given, the output of 'git worktree add' is just: Preparing foo (identifier foo) even though the HEAD is set to a commit, which is just not checked out. I think I can live with that for now, I personally don't use '--no-checkout', and we could fix this at some point in the future if we desire to do so. I think we can consider that out of scope for this patch series, as its main goal is to introduce the new dwim. > Thanks for the suggestion!