On Fri, Jul 29, 2016 at 6:49 PM, Jeff King <peff@xxxxxxxx> wrote: > On Fri, Jul 29, 2016 at 03:45:35PM -0700, Junio C Hamano wrote: > >> Jeff King <peff@xxxxxxxx> writes: >> >> > TBH, I'm not sure anybody cares that much between the three. Even before >> > user.useConfigOnly, this could be an issue on machines where the ident >> > could not be auto-configured, and it seems like nobody ran across it. >> > It's only the funny interaction with pull.rebase that makes it likely to >> > come up, so as long as that code path is fixed (one way or another), I >> > doubt anybody would bring it up again. >> >> Yup, I do not think the choice among the three would make all that >> much difference in practice. If I really have to pick one of them, >> I think the one in your message I am responding to would make the >> most sense. >> >> The one I sent, which I wrote as a response to some end-user request >> on the list back then, has been sitting on 'pu' for quite a while >> because I didn't see a real use or positive support for it, and the >> only reason why I sent it is because this might be that one >> real use it wanted to see. > > BTW, I didn't actually test yours, but if we do go that route I suspect > you can reuse the tests I posted by just replacing "git rebase" with > "git pull --rebase=<true|preserve> . master". > >> > In some ways this is less convenient, but in some ways it is >> > more so; the user can then manually commit or even "git >> > rebase --continue" after setting up their ident (or >> > providing it as a one-off on the command line). >> >> Yup, that is the controvercial bit, and I suspect Dscho's original >> was siding for the "set up ident first, as you will need it anyway >> eventually", so I'll let others with viewpoints different from us to >> chime in first before picking it up. > > Very sensible. Thanks. > > -Peff All of the options sounds OK to me. I do like the idea of being able to set it and --continue what I was doing. Even more convenient than that would be an optional "user.prompt=true" so the ident check could get what it needs from a simple terminal prompt, set it in the local config, and try again before returning. While that would be nice, I've been OK with the current system for my working repositories for a while. I'm used to having to go set it and repeat whatever I was trying to do, as it seems like I forget to set my user.email about half of the time :) -Dakota -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html