Re: [PATCH] git: add --no-optional-locks option
From: Jeff King <hidden>
Date: 2017-09-25 17:00:19
On Mon, Sep 25, 2017 at 06:10:12PM +0200, Johannes Schindelin wrote:
On Thu, 21 Sep 2017, Jeff King wrote:quoted
Johannes, this is an adaptation of your 67e5ce7f63 (status: offer *not* to lock the index and update it, 2016-08-12). Folks working on GitHub Desktop complained to me that it's only available on Windows. :)Okay, so this is trying to help me by upstreaming a patch from Git for Windows? If so: thanks!
Yes, in a round-about way. :)
The changes, in particular the different semantics, will guarantee that I have to work on the consumer's side here, though, leaving me even less time for the Git mailing list, so I will need a lot more help with upstreaming patches.
I think you can get away with doing nothing for the time being. The two patches can co-exist in the GfW codebase[1], and people using the existing option can switch over at their leisure. Eventually you may decide to revert 67e5ce7f63. -Peff [1] Modulo some trivial conflict resolution when the two are merged.