Merge branch 'stable-4.9' into stable-4.10

* stable-4.9:
  Retry stale file handles on .git/config file

Change-Id: I6db7256dbd1c71b23e1231809642ca21e996e066
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index 45a6af3755a95696740590b2dc07a48ef5992b83,8bae60b0e37c1dd4ad71f62778d96a3d6a145679..b29383e48103ae3ce40434fe7b6e3802f8111c67
--- 1/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
--- 2/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@@ -130,9 -128,7 +130,10 @@@ commitMessageNotSpecified=commit messag
  commitOnRepoWithoutHEADCurrentlyNotSupported=Commit on repo without HEAD currently not supported
  commitAmendOnInitialNotPossible=Amending is not possible on initial commit.
  compressingObjects=Compressing objects
 +configSubsectionContainsNewline=config subsection name contains newline
 +configSubsectionContainsNullByte=config subsection name contains byte 0x00
 +configValueContainsNullByte=config value contains byte 0x00
+ configHandleIsStale=config file handle is stale, {0}. retry
  connectionFailed=connection failed
  connectionTimeOut=Connection time out: {0}
  contextMustBeNonNegative=context must be >= 0

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index e23d2534b6333529508bbeb7ea57b0fa6f84f4ed,9d757a5226575c5533f70d5e9afccdec7e223d51..4c16fe71fb6317d7c158363e70ea5391c77429c1
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@@ -191,9 -187,7 +191,10 @@@ public class JGitText extends Translati
        /***/ public String commitOnRepoWithoutHEADCurrentlyNotSupported;
        /***/ public String commitAmendOnInitialNotPossible;
        /***/ public String compressingObjects;
 +      /***/ public String configSubsectionContainsNewline;
 +      /***/ public String configSubsectionContainsNullByte;
 +      /***/ public String configValueContainsNullByte;
+       /***/ public String configHandleIsStale;
        /***/ public String connectionFailed;
        /***/ public String connectionTimeOut;
        /***/ public String contextMustBeNonNegative;

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java
index 9927daf3d5154af6dc0cafc3425b8d513e95f2aa,b2689797be616c0aa6a6f99b4fc67fce8a7a8301..3f064e3341e51838ba685cb41e167f98719b8849
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java
@@@ -73,10 -75,11 +76,13 @@@ import org.slf4j.LoggerFactory
   * The configuration file that is stored in the file of the file system.
   */
  public class FileBasedConfig extends StoredConfig {
+       private final static Logger LOG = LoggerFactory
+                       .getLogger(FileBasedConfig.class);
+ 
        private final File configFile;
  
 +      private final FS fs;
 +
        private boolean utf8Bom;
  
        private volatile FileSnapshot snapshot;