]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.4' into stable-5.5 06/149106/6
authorMatthias Sohn <matthias.sohn@sap.com>
Sun, 8 Sep 2019 15:35:14 +0000 (17:35 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Sun, 8 Sep 2019 15:35:14 +0000 (17:35 +0200)
* stable-5.4:
  Format BUILD files with buildifier
  Format BUILD files with buildifier
  [error prone] Suppress NonAtomicVolatileUpdate in SimpleLruCache
  Bazel: Format BUILD files with buildifier
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
  Bazel: Fix warning about deprecated lib.bzl
  Format lib/BUILD with buildifier
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
  Bazel: Bump minimum supported version to 0.29.0
  Bazel: Bump skylib library version to 0.8.0
  Use bazelisk to switch between used bazel version
  Bazel: Require minimum bazel version 0.17.1
  Fix wrong placeholder index in error message packInaccessible
  JGitText: Remove unused externalized strings
  RepoText: Remove unused externalized string
  CLI: Remove unused externalized strings

Change-Id: Idf3abd80ad3b00188f655e638d9908228770911f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
WORKSPACE
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java
org.eclipse.jgit.test/BUILD
org.eclipse.jgit/BUILD
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java

diff --cc WORKSPACE
Simple merge
index b2ec57c7495c0467e81eec882b1955f982e1a7ac,124bb44d338c476cd6cabec6c942ed6ae98e18a1..f02944265a1ade1663732844c10040901046b4f2
@@@ -155,9 -153,6 +153,8 @@@ needSingleRevision=Needed a single revi
  noGitRepositoryConfigured=No Git repository configured.
  noNamesFound=No names found, cannot describe anything.
  noSuchFile=no such file: {0}
- noSuchRemoteRef=no such remote ref: ''{0}''
 +noSuchPathInRef=no such path ''{0}'' in {1}
 +noSuchRef=no such ref: {0}
  noSystemConsoleAvailable=No System.console available
  noTREESectionInIndex=no 'TREE' section in index
  nonFastForward=non-fast forward
index 1054944ffdf7737c2d7f2e82cc4e3bd64760092d,8a3e43e0905f71925bc4f78ee515442d0f008839..3d81e7c3f274413a559fe419dff231e9b2c94123
@@@ -257,9 -255,6 +255,8 @@@ public class CLIText extends Translatio
        /***/ public String noGitRepositoryConfigured;
        /***/ public String noNamesFound;
        /***/ public String noSuchFile;
-       /***/ public String noSuchRemoteRef;
 +      /***/ public String noSuchPathInRef;
 +      /***/ public String noSuchRef;
        /***/ public String noTREESectionInIndex;
        /***/ public String nonFastForward;
        /***/ public String noSystemConsoleAvailable;
Simple merge
Simple merge
index 5a4d9bb9906dc7c34ad6515929e08aa9bdf1fa94,049888272bdf5cc8e0441aa612166b801b8415dd..6b09faf0a13e90c26dbb2c80e6194f7be537d3c7
@@@ -662,9 -601,7 +606,8 @@@ shortReadOfOptionalDIRCExtensionExpecte
  shortSkipOfBlock=Short skip of block.
  signingNotSupportedOnTag=Signing isn't supported on tag operations yet.
  similarityScoreMustBeWithinBounds=Similarity score must be between 0 and 100.
- sizeExceeds2GB=Path {0} size {1} exceeds 2 GiB limit.
  skipMustBeNonNegative=skip must be >= 0
 +skipNotAccessiblePath=The path ''{0}'' isn't accessible. Skip it.
  smartHTTPPushDisabled=smart HTTP push disabled
  sourceDestinationMustMatch=Source/Destination must match.
  sourceIsNotAWildcard=Source is not a wildcard.
index b80b7498b161934157936455b53fc81f255e4bea,60d1dab23fd2d59c0ee52c0a59763111e944ee24..6a7d22df9dee4fa149b9e5715abfde7f1558b455
@@@ -723,9 -662,7 +667,8 @@@ public class JGitText extends Translati
        /***/ public String shortSkipOfBlock;
        /***/ public String signingNotSupportedOnTag;
        /***/ public String similarityScoreMustBeWithinBounds;
-       /***/ public String sizeExceeds2GB;
        /***/ public String skipMustBeNonNegative;
 +      /***/ public String skipNotAccessiblePath;
        /***/ public String smartHTTPPushDisabled;
        /***/ public String sourceDestinationMustMatch;
        /***/ public String sourceIsNotAWildcard;