Hi Junio, On 09/12/2020 11:15, Junio C Hamano wrote: > Srinidhi Kaushik <shrinidhi.kaushik@xxxxxxxxx> writes: > > > The `--force-with-lease[=<refname>[:<expect]]` option in `git-push` > > makes sure that refs on remote aren't clobbered by unexpected changes > > when the "<refname>" and "<expect>" ref values are explicitly specified. > > If you did a feature with different semantics to satisfy Dscho's > need, then this is no longer "make force-with-lease safer", I would > think. Hopefully it is just the cover letter. Yes, this patch is about the new option, but I thought of keeping the original reason for introducing it in the cover letter for context. I will add this as a note and change subjject cover letter in v3. > > The new option `--force-if-includes` will allow forcing an update only > > if the tip of the remote-tracking ref has been integrated locally. > > Using this along with `--force-with-lease`, during the time of push > > can help preventing unintended remote overwrites. > > "if-includes" sounds quite sensible. I think you want to lose the > word "lease" from the configuration variable name. I do not think > it should be on by default, though. Thanks; that makes sense. I am thinking of just adding the option as a command line argument without a configuration option. Will change this in the next patch-set. > [...] Thanks again, for reviewing this. -- Srinidhi Kaushik
