Merge remote-tracking branch 'upstream/master'

Conflicts:
	git/util.py

git/util.py

@@ -6,13 +6,6 @@
 from __future__ import unicode_literals
 
 from fcntl import flock, LOCK_UN, LOCK_EX, LOCK_NB
-import os
-import re
-import sys
-import time
-import stat
-import shutil
-import platform
 import getpass
 import logging
 import os
@@ -593,7 +586,10 @@ def _obtain_lock_or_raise(self):
 
         # Create file and lock
         try:
-            fd = os.open(lock_file, os.O_CREAT, 0)
+            flags = os.O_CREAT
+            if is_win:
+                flags |= os.O_SHORT_LIVED
+            fd = os.open(lock_file, flags, 0)
         except OSError as e:
             raise IOError(str(e))
 
@@ -617,8 +613,14 @@ def _release_lock(self):
 
         flock(fd, LOCK_UN)
         os.close(fd)
-        os.remove(lock_file)
 
+        # if someone removed our file beforhand, lets just flag this issue
+        # instead of failing, to make it more usable.
+        lfp = self._lock_file_path()
+        try:
+            rmfile(lfp)
+        except OSError:
+            pass
         self._owns_lock = False
         self._file_descriptor = None