motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-5.6' into stable-5.7 

* stable-5.6:
  Remove texts which were added by mistake in 00386272
  Fix formatting which was broken in 00386272

Change-Id: I45d444b360485564744bf3dfad2c2f5a5e7fcdf6
This commit is contained in:
Matthias Sohn 2021-05-11 23:32:22 +02:00
parent 0616016c83 37436cc933
commit 26dee2d984
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
View File

@ -418,10 +418,6 @@ lockOnNotClosed=Lock on {0} not closed.
lockOnNotHeld=Lock on {0} not held. lockOnNotHeld=Lock on {0} not held.
lockStreamClosed=Output to lock on {0} already closed lockStreamClosed=Output to lock on {0} already closed
lockStreamMultiple=Output to lock on {0} already opened lockStreamMultiple=Output to lock on {0} already opened
logInconsistentFiletimeDiff={}: inconsistent duration from file timestamps on {}, {}: {} > {}, but diff = {}. Aborting measurement at resolution {}.
logLargerFiletimeDiff={}: inconsistent duration from file timestamps on {}, {}: diff = {} > {} (last good value). Aborting measurement.
logSmallerFiletime={}: got smaller file timestamp on {}, {}: {} < {}. Aborting measurement at resolution {}.
logXDGConfigHomeInvalid=Environment variable XDG_CONFIG_HOME contains an invalid path {}
maxCountMustBeNonNegative=max count must be >= 0 maxCountMustBeNonNegative=max count must be >= 0
mergeConflictOnNonNoteEntries=Merge conflict on non-note entries: base = {0}, ours = {1}, theirs = {2} mergeConflictOnNonNoteEntries=Merge conflict on non-note entries: base = {0}, ours = {1}, theirs = {2}
mergeConflictOnNotes=Merge conflict on note {0}. base = {1}, ours = {2}, theirs = {2} mergeConflictOnNotes=Merge conflict on note {0}. base = {1}, ours = {2}, theirs = {2}

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
View File

@ -446,10 +446,6 @@ public static JGitText get() {
/***/ public String lockOnNotHeld; /***/ public String lockOnNotHeld;
/***/ public String lockStreamClosed; /***/ public String lockStreamClosed;
/***/ public String lockStreamMultiple; /***/ public String lockStreamMultiple;
/***/ public String logInconsistentFiletimeDiff;
/***/ public String logLargerFiletimeDiff;
/***/ public String logSmallerFiletime;
/***/ public String logXDGConfigHomeInvalid;
/***/ public String maxCountMustBeNonNegative; /***/ public String maxCountMustBeNonNegative;
/***/ public String mergeConflictOnNonNoteEntries; /***/ public String mergeConflictOnNonNoteEntries;
/***/ public String mergeConflictOnNotes; /***/ public String mergeConflictOnNotes;

3
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
View File

@ -331,8 +331,7 @@ private OutputStream get() throws IOException {
} }
@Override @Override
public void write(byte[] b, int o, int n) public void write(byte[] b, int o, int n) throws IOException {
throws IOException {
get().write(b, o, n); get().write(b, o, n);
} }