Junio C Hamano <gitster@xxxxxxxxx> writes: > Jeff King <peff@xxxxxxxx> writes: > >> [1] Another sticking point is that this really does need to be in the >> reflog of the ref we are pushing (and not, e.g., HEAD). But one does >> not always push from a ref. I suspect that's OK in practice, though. >> If you are doing "git push --force-with-lease HEAD~2:master", it is >> probably OK for us to error out with "uh, lease from what?". > > I actually expect this to bite me personally, as I often do not > rewind the actual "topic" ref that is my target of rewriting, > because I am a chicken---I detach the HEAD and build a history there > to see if I can come up with a better history, compare the result > with what is on the "topic" (which is not touched at all during the > rewriting), and after all is done, do a "checkout -B topic". The > "remote tip must appear in the local reflog" rule will never be > satisfied. Well "bite" is not quite accurate, as I do not push to a repository racing with others, and there is no reason for me to use --force with lease. I always push '+pu', and push '+next" once after each release, and there is no need for any lease when I push things out. But if I were collaborating with others in another project that uses a shared central repository workflow, and if I were in the mood to see how well/better this "improved safer DWIM" mode behaves, then it would bite me.
