Merge branch 'jk/no-optional-locks'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Oct 2017 06:42:48 +0000 (15:42 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Oct 2017 06:42:49 +0000 (15:42 +0900)
commitd4e93836a6a072e392b20d7daf604fd41e15ecf9
tree69f37e3a5a7239b416a0c75b9d52114cb9e048d3
parentd9ec072a2903f31a0e1afde4125f62b9fc57f620
parent27344d6a6c8056664966e11acf674e5da6dd7ee3
Merge branch 'jk/no-optional-locks'

Some commands (most notably "git status") makes an opportunistic
update when performing a read-only operation to help optimize later
operations in the same repository.  The new "--no-optional-locks"
option can be passed to Git to disable them.

* jk/no-optional-locks:
  git: add --no-optional-locks option
builtin/commit.c
cache.h
environment.c
git.c