]> source.dussan.org Git - jgit.git/log
jgit.git
4 years agoJGit v5.8.0.202005061305-m2 77/162577/1 v5.8.0.202005061305-m2
Matthias Sohn [Wed, 6 May 2020 17:06:11 +0000 (19:06 +0200)]
JGit v5.8.0.202005061305-m2

Change-Id: I9d9e5a9e000a74513896744cc3646430cb872893
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoUpdate to bouncycastle 1.65 and orbit I20200506000552 70/162570/3
Matthias Sohn [Wed, 6 May 2020 14:33:46 +0000 (16:33 +0200)]
Update to bouncycastle 1.65 and orbit I20200506000552

Bug: 553206
Change-Id: I867bbe88b847bf6d17f17f6cf8c565cd4a2437cc
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoApplyCommand: use Files#copy to copy file 32/162532/3
Matthias Sohn [Wed, 6 May 2020 07:36:52 +0000 (09:36 +0200)]
ApplyCommand: use Files#copy to copy file

This should be faster.

Change-Id: I404ec5e66731b3cf7a8e621cf1ff8748d109ea69
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoApply hunks when renaming or copying from patch files 49/161149/7
Jack Wickham [Wed, 25 Mar 2020 17:58:54 +0000 (17:58 +0000)]
Apply hunks when renaming or copying from patch files

When applying a patch that contains renames or copies using ApplyCommand,
also apply all hunks that apply to the renamed or copied file.

Change-Id: I9f3fa4370458bd7c14beeb2e2b49e846d70203cb
Signed-off-by: Jack Wickham <jwickham@palantir.com>
4 years agoCreate parent directories when renaming a file in ApplyCommand 56/161156/5
Jack Wickham [Fri, 17 Apr 2020 17:33:39 +0000 (18:33 +0100)]
Create parent directories when renaming a file in ApplyCommand

Before this change, applying a patch will fail if the destination directory
doesn't exist; after, the necessary parent directories are created.

If renaming the file fails, the directories won't be deleted, so this change
isn't atomic. However, ApplyCommand is already not atomic - if one hunk fails
to apply, other hunks still get applied - so I don't think that is a blocker.

Change-Id: Iea36138b806d4e7012176615bcc673756a82f365
Signed-off-by: Jack Wickham <jwickham@palantir.com>
4 years agoReduce BitmappedObjectReachabilityChecker visibility 02/162002/2
Ivan Frade [Mon, 4 May 2020 18:41:19 +0000 (11:41 -0700)]
Reduce BitmappedObjectReachabilityChecker visibility

ObjectReachabilityChecker interface is the only public API. The
implementation is instantiated by ObjectWalk and doesn't need to be
visible outside the package.

Change-Id: I5b97bb98990cded637686bdc15c9655330b7780f
Signed-off-by: Ivan Frade <ifrade@google.com>
4 years agoAdd missing @since to new API 61/161961/1
Thomas Wolf [Mon, 4 May 2020 07:30:24 +0000 (09:30 +0200)]
Add missing @since to new API

Change-Id: Ie7c3481aba515d9c9b0a152db17b5a9dc74e7ede
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
4 years agoAdd missing test source file to the build 52/161952/1
David Ostrovsky [Sun, 3 May 2020 21:20:03 +0000 (23:20 +0200)]
Add missing test source file to the build

Change-Id: I020ff281eaa49794aeb1853711485bc8c7047dd8
Signed-off-by: David Ostrovsky <david@ostrovsky.org>
4 years agoUpgrade Tycho to 1.7.0 60/161860/1
Michael Keppler [Fri, 1 May 2020 08:34:22 +0000 (10:34 +0200)]
Upgrade Tycho to 1.7.0

Change-Id: I41d927e53f040750bbf0160dc15d8ca8a3f9f7ca
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
4 years agoObjectReachabilityCheckers: Make walk member final 35/161835/1
Ivan Frade [Thu, 30 Apr 2020 17:21:42 +0000 (10:21 -0700)]
ObjectReachabilityCheckers: Make walk member final

It is only assigned on initialization.

Change-Id: I36f68b3f511236e66cc7a4f56ba49252b317276a
Signed-off-by: Ivan Frade <ifrade@google.com>
4 years agoUpgrade wagon-ssh to 3.4.0 08/161608/5
David Pursehouse [Mon, 27 Apr 2020 23:18:38 +0000 (08:18 +0900)]
Upgrade wagon-ssh to 3.4.0

Change-Id: Id9a1bf7fcdba7c011ccff54188dfb1bef8bf8a4b
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoMerge branch 'stable-5.7' 79/161779/1
Matthias Sohn [Wed, 29 Apr 2020 21:22:39 +0000 (23:22 +0200)]
Merge branch 'stable-5.7'

* stable-5.7:
  Bump Bazel version to 3.1.0

Change-Id: I108815577a5aab605891496c17d6f225d35f7346
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoMerge branch 'stable-5.6' into stable-5.7 78/161778/1
Matthias Sohn [Wed, 29 Apr 2020 21:21:50 +0000 (23:21 +0200)]
Merge branch 'stable-5.6' into stable-5.7

* stable-5.6:
  Bump Bazel version to 3.1.0

Change-Id: I8a9f39370ab506d9ff5763ed2d05f0d970bbd10b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoUploadPack: Use more relevant refs first in object reachability check 60/160560/4
Ivan Frade [Mon, 6 Apr 2020 21:35:52 +0000 (14:35 -0700)]
UploadPack: Use more relevant refs first in object reachability check

The bitmap-bassed object reachability checker, tries to find the objects
in the first starter, then adding the second starter... and so on. This
rewards passing the most popular refs first.

Order the refs with heads first, then tags, then others (e.g. changes)
for the object reachability checker. Using streams, delay also the
resolution of the ref to RevObject until necessary.

Change-Id: I9414b76754d7c0ffee1e2eeed6939895c8e92cbe
Signed-off-by: Ivan Frade <ifrade@google.com>
4 years agoUploadPack: Refactor to generalize the object reachability checks 59/160559/4
Ivan Frade [Sat, 4 Apr 2020 06:27:33 +0000 (23:27 -0700)]
UploadPack: Refactor to generalize the object reachability checks

ObjectWalk#createObjectReachabilityChecker() returns the best
implementation for the repo. UploadPack can use the interface and fold
the with/without commits cases in one code path.

Change-Id: I857c11735d1d8e36c3ed8185ff11de8a62e86540
Signed-off-by: Ivan Frade <ifrade@google.com>
4 years agoUploadPack: Use BitmappedReachabilityChecker for not advertised wants 58/160558/4
Ivan Frade [Sat, 4 Apr 2020 06:20:27 +0000 (23:20 -0700)]
UploadPack: Use BitmappedReachabilityChecker for not advertised wants

Change-Id: Ifea971d5c0309e28a909441ee8a6f1e62397d6d3
Signed-off-by: Ivan Frade <ifrade@google.com>
4 years agorevwalk: Introduce bitmap-based object reachability checker 57/160557/4
Ivan Frade [Sat, 4 Apr 2020 05:04:15 +0000 (22:04 -0700)]
revwalk: Introduce bitmap-based object reachability checker

Change-Id: I0b1a2bd21f98894862aab339f8c2e4a417897b89
Signed-off-by: Ivan Frade <ifrade@google.com>
4 years agoBump Bazel version to 3.1.0 99/161699/1
David Pursehouse [Wed, 29 Apr 2020 04:53:45 +0000 (13:53 +0900)]
Bump Bazel version to 3.1.0

Change-Id: Id58d1603846a88be3493165583adca481c026eed
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agorevwalk: Extract ObjectReachabilityChecker interface 56/160556/3
Ivan Frade [Sat, 4 Apr 2020 04:48:34 +0000 (21:48 -0700)]
revwalk: Extract ObjectReachabilityChecker interface

Extract ObjectReachabilityChecker interface from the walk-based
implementation, to add a bitmapped based implementation later.

Refactor the test case to use it for both implementations.

Change-Id: Iaac7c6b037723811956ac22625f27d3b4d742139
Signed-off-by: Ivan Frade <ifrade@google.com>
4 years agoUploadPack: Extract walk-based reachability check 55/160555/3
Ivan Frade [Thu, 2 Apr 2020 05:10:09 +0000 (22:10 -0700)]
UploadPack: Extract walk-based reachability check

Preparing the code to optimize the bitmap-based object reachability
checker.  We are mirroring first the commit reachability checker
structure (interface + 2 implementations).

Move the walk-base reachability checker to its own class.

This class is public at the moment. Later ObjectWalk will return an
interface and this implementation will be package-private.

Change-Id: Ifac70094e1af137291c3607d95e689992f814b26
Signed-off-by: Ivan Frade <ifrade@google.com>
4 years agoEnable passing java options to jgit command line executable 33/161633/3
Matthias Sohn [Tue, 28 Apr 2020 06:41:34 +0000 (08:41 +0200)]
Enable passing java options to jgit command line executable

This allows to pass java options to the jgit command line executable
by setting the environment variable "java_args", e.g.

$ java_args="-Xmx8g" jgit log

Change-Id: Ic7271b104737a8306d9db0f1895079b9f7bb7fd0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoRefTreeBatch: fix unclosed resource warning 32/161632/1
Matthias Sohn [Mon, 27 Apr 2020 13:15:11 +0000 (15:15 +0200)]
RefTreeBatch: fix unclosed resource warning

Change-Id: I7d630d11d3ef2ff2b74ec7a7018760b7b4931ad2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoCherryPickCommand: fix unclosed resource warning 31/161631/1
Matthias Sohn [Mon, 27 Apr 2020 13:14:52 +0000 (15:14 +0200)]
CherryPickCommand: fix unclosed resource warning

Change-Id: I2dc76efd16d887048a5cb4af2b2d8e6faa4f22cd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoURIish: suppress non-localized message warning 78/161578/2
Matthias Sohn [Mon, 27 Apr 2020 13:11:52 +0000 (15:11 +0200)]
URIish: suppress non-localized message warning

Change-Id: I3ec37c67ba6f00ad8bf396aa3261dd90f35789ea
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoAlways use https to access download.eclipse.org 73/161573/1
Matthias Sohn [Mon, 27 Apr 2020 12:52:04 +0000 (14:52 +0200)]
Always use https to access download.eclipse.org

Change-Id: Ida3cd74dc80020308496f53bdda3676b616953d4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoUploadPack: Clear advertised ref map after negotiation 41/161341/3
Minh Thai [Wed, 22 Apr 2020 04:17:58 +0000 (21:17 -0700)]
UploadPack: Clear advertised ref map after negotiation

After negotiation phase of a fetch, the advertised ref map is no longer used and
can be safely cleared. For >1GiB repos object selection and packfile writing may
take 10s of minutes. For the chromium.googlesource.com/chromium/src repo, this
advertised ref map is >400MiB. Returning this memory to the Java heap is a major
scalability win.

Change-Id: I00d453c5ef47630c21f199e333e1cfcf47b7e92a
Signed-off-by: Minh Thai <mthai@google.com>
4 years agoUse Map directly in MetaFilter 73/161373/1
Lars Vogel [Wed, 22 Apr 2020 12:37:20 +0000 (14:37 +0200)]
Use Map directly in MetaFilter

Change-Id: I15545e9c7cdcbb8a913cbcf0eef7f8a2281de7a8
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
4 years agoFix human name for local .bundle files 50/161250/4
Konrad Windszus [Mon, 20 Apr 2020 19:43:12 +0000 (21:43 +0200)]
Fix human name for local .bundle files

Bug: 560903
Change-Id: I15d45330398cc573940265d16a2db29ddce085aa
Signed-off-by: Konrad Windszus <konrad_w@gmx.de>
4 years agoMerge branch 'stable-5.7' 79/161179/1
Matthias Sohn [Sat, 18 Apr 2020 17:08:01 +0000 (19:08 +0200)]
Merge branch 'stable-5.7'

* stable-5.7:
  Bazel: Disable SecurityManagerMissingPermissionsTest test

Change-Id: Id8665d1ba630c1359e86846548143a785b178e75
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoBazel: Disable SecurityManagerMissingPermissionsTest test 64/161164/5
David Ostrovsky [Fri, 17 Apr 2020 22:00:32 +0000 (00:00 +0200)]
Bazel: Disable SecurityManagerMissingPermissionsTest test

In Id5376f09f0d a test with dependency on log4j library was added, but
the library was missed to be added to the Bazel build tool chain.

Given that Bazel test runner doesn't suport custom security manager the
test wouldn't pass even if the missing dependency would be added. The
only solution we have for now is to exclude that test from Bazel tool
chain.

Filed a feature request for bazel to support such tests at
https://github.com/bazelbuild/bazel/issues/11146

Bug: 562274
Change-Id: I873a0e09addc583455b68122f66cd3952e485f0e
Signed-off-by: David Ostrovsky <david@ostrovsky.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoMerge branch 'stable-5.7' 66/161166/1
Matthias Sohn [Fri, 17 Apr 2020 22:40:57 +0000 (00:40 +0200)]
Merge branch 'stable-5.7'

* stable-5.7:
  Remove double blank from sentence start
  Bump Bazel version to 3.0.0
  Scan through all merged reftables for max/min update indices

Change-Id: Idee792c6e65ca3fb283dba850f17d6554aaa1fa7

4 years agoMerge branch 'stable-5.6' into stable-5.7 65/161165/1
Matthias Sohn [Fri, 17 Apr 2020 22:30:15 +0000 (00:30 +0200)]
Merge branch 'stable-5.6' into stable-5.7

* stable-5.6:
  Remove double blank from sentence start
  Bump Bazel version to 3.0.0

Change-Id: I26c3a8345020239d1c2ec5c6f70a633b43ddab86

4 years agoRemove double blank from sentence start 14/161114/1
Michael Keppler [Tue, 14 Apr 2020 07:31:50 +0000 (09:31 +0200)]
Remove double blank from sentence start

Multiple whitespaces are not normalized when reading properties files,
therefore leading to unwanted space/indentation in console or UI output.

Change-Id: I1f5224fe359e0cac493e0237872afc75dc8b9fbe
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
(cherry picked from commit ebbc3efce73278d6e0dbb1acd099db2446b1bed9)

4 years agoUpgrade maven-antrun-plugin to 3.0.0 50/161050/1
David Pursehouse [Thu, 16 Apr 2020 11:15:23 +0000 (20:15 +0900)]
Upgrade maven-antrun-plugin to 3.0.0

Change-Id: I79d55d1c0b30cddfcc6a188af87ea08d802c4c3c
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoUpgrade maven-shade-plugin to 3.2.3 88/160888/2
David Pursehouse [Tue, 14 Apr 2020 09:33:46 +0000 (18:33 +0900)]
Upgrade maven-shade-plugin to 3.2.3

Change-Id: Idf84a1a22b250484db5d03cf55c5207be37511b9
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoRemove double blank from sentence start 75/160875/1
Michael Keppler [Tue, 14 Apr 2020 07:31:50 +0000 (09:31 +0200)]
Remove double blank from sentence start

Multiple whitespaces are not normalized when reading properties files,
therefore leading to unwanted space/indentation in console or UI output.

Change-Id: I1f5224fe359e0cac493e0237872afc75dc8b9fbe
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
4 years agoBump Bazel version to 3.0.0 67/160567/1
David Pursehouse [Tue, 7 Apr 2020 07:11:42 +0000 (16:11 +0900)]
Bump Bazel version to 3.0.0

Change-Id: I3866b58d3d288f37b1818be5b56d05e8be6ecb0f
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoMerge "ReceivePack: Use error message if set"
Terry Parker [Mon, 6 Apr 2020 15:20:46 +0000 (11:20 -0400)]
Merge "ReceivePack: Use error message if set"

4 years agoScan through all merged reftables for max/min update indices 20/159920/2
Minh Thai [Fri, 20 Mar 2020 06:10:41 +0000 (23:10 -0700)]
Scan through all merged reftables for max/min update indices

Since reftables might have update index ranges that are overlapped.

Change-Id: I8f8215b99a0a978d4dd0155dbaf33e5e06ea8202
Signed-off-by: Minh Thai <mthai@google.com>
(cherry picked from commit 06748c205c44bb4eaf6015387112de97f566c6a2)

4 years agoFileUtils: improve delete (Windows) 10/159310/5
Alexander Nittka [Fri, 13 Mar 2020 13:16:50 +0000 (14:16 +0100)]
FileUtils: improve delete (Windows)

Ensure files are writable before trying to delete them.

Bug: 408846
Change-Id: I930a547594bba853c33634ae54bd64d236afade3
Signed-off-by: Alexander Nittka <alex@nittka.de>
4 years agoMerge branch 'stable-5.7' 23/160423/1
Thomas Wolf [Fri, 3 Apr 2020 08:39:37 +0000 (10:39 +0200)]
Merge branch 'stable-5.7'

* stable-5.7:
  FS.runInShell(): handle quoted filters and hooksPath containing blanks
  Handle non-normalized index also for executable files
  Prepare 5.7.1-SNAPSHOT builds
  JGit v5.7.0.202003110725-r

Change-Id: I8a8580e44bfa05989d476cf22a029abd4fd407c6
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
4 years agoMerge branch 'stable-5.6' into stable-5.7 22/160422/1
Thomas Wolf [Fri, 3 Apr 2020 08:18:10 +0000 (10:18 +0200)]
Merge branch 'stable-5.6' into stable-5.7

* stable-5.6:
  FS.runInShell(): handle quoted filters and hooksPath containing blanks
  Handle non-normalized index also for executable files

Change-Id: I240377e87c073ee7a621a88e39fc319c59fa037a
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
4 years agoFS.runInShell(): handle quoted filters and hooksPath containing blanks 05/160405/2
Thomas Wolf [Thu, 2 Apr 2020 19:15:18 +0000 (21:15 +0200)]
FS.runInShell(): handle quoted filters and hooksPath containing blanks

Revert commit 2323d7a. Using $0 in the shell command call results in
the command string being taken literally. That was introduced to fix
a problem with backslashes, but is actually not correct.

First, the problem with backslashes occurred only on Win32/Cygwin,
and has been properly fixed in commit 6f268f8.

Second, this is used only for hooks (which don't have backslashes in
their names) and filter commands from the git config, where the user
is responsible for properly quoting or escaping such that the commands
work.

Third, using $0 actually breaks correctly quoted filter commands
like in the bug report. The shell really takes the command literally,
and then doesn't find the command because of quotes.

So revert this change.

At the same time there's a related problem with hooks. If the path to
the hook contains blanks, runInShell() would also fail to find the
hook. In this case, the command doesn't come from user input but is
just a Java File object with an absolute path containing blanks. (Can
occur if core.hooksPath points to such a path with blanks, or if the
repository has such a path.)

The path to the hook as obtained from the file system must be quoted.

Add a test for a hook path with a blank.

This reverts commit 2323d7a1ef909f9deb3f21329cf30bd1173ee9cf.

Bug: 561666
Change-Id: I4d7df13e6c9b245fe1706e191e4316685a8a9d59
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
4 years agoDocument gc and pack relevant options 14/160014/5
Matthias Sohn [Wed, 25 Mar 2020 22:50:44 +0000 (23:50 +0100)]
Document gc and pack relevant options

Change-Id: Iab7262b25942fa8c062b979d394674635b70a284
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoDefine constants for pack config option keys 53/160153/3
Matthias Sohn [Sun, 29 Mar 2020 11:08:26 +0000 (13:08 +0200)]
Define constants for pack config option keys

Change-Id: Ifb8227cb62370029d6774f2a22b15d6478c713ca
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoFix javadoc typo 59/160359/1
Karsten Thoms [Thu, 2 Apr 2020 08:54:43 +0000 (10:54 +0200)]
Fix javadoc typo

Bug: 499934
Change-Id: I0d6ee56fad4472972f69cc1e7cb2a727e95ab6b4
Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>
4 years agoUpgrade ecj to 3.21.0 22/160122/1
David Pursehouse [Sat, 28 Mar 2020 03:41:34 +0000 (12:41 +0900)]
Upgrade ecj to 3.21.0

Change-Id: Id337a320a59a77c36866f668ea1e30780bb55f35
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoReceivePack: Use error message if set 69/159969/4
Masaya Suzuki [Tue, 24 Mar 2020 18:50:34 +0000 (11:50 -0700)]
ReceivePack: Use error message if set

ReceiveCommand can have an error message. This is shown only for some
cases even if it's set. This change uses the error message if it's set,
and fallback to the default message if unset.

Change-Id: I8d906e71ad08cf49bcdb28caea8fcc66798c68ff
Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
4 years agoHandle non-normalized index also for executable files 80/159980/1
Thomas Wolf [Wed, 25 Mar 2020 08:13:20 +0000 (09:13 +0100)]
Handle non-normalized index also for executable files

Commit 60cf85a4 corrected the handling of check-in for files where
the index version is non-normalized, i.e., contains CR-LF line endings.
However, it did so only for regular files, not executable files.

Bug: 561438
Change-Id: I372cc990c5efeb00315460f36459c0652d5d1e77
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
4 years agoMerge "Scan through all merged reftables for max/min update indices"
Terry Parker [Mon, 23 Mar 2020 14:51:45 +0000 (10:51 -0400)]
Merge "Scan through all merged reftables for max/min update indices"

4 years agoUpdate to org.apache.sshd 2.4.0 42/159742/2
Thomas Wolf [Thu, 12 Mar 2020 18:38:57 +0000 (19:38 +0100)]
Update to org.apache.sshd 2.4.0

Change target platforms to Orbit I20200319180910 and regenerate them.
Change package imports to [2.4.0,2.5.0); adapt code to upstream API
changes.

Maven build: update version in root pom.

Bazel build: update version & hash in WORKSPACE file.

Proxy functionality verified manually using 3proxy (HTTP & SOCKS,
with basic authentication) and ssh -vvv -D7020 localhost (SOCKS, no
authentication).

Bug: 561078
Change-Id: I582f6b98055b013c006f2c749890fe6db801cbaa
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
4 years agoScan through all merged reftables for max/min update indices 67/159767/2
Minh Thai [Fri, 20 Mar 2020 06:10:41 +0000 (23:10 -0700)]
Scan through all merged reftables for max/min update indices

Since reftables might have update index ranges that are overlapped.

Change-Id: I8f8215b99a0a978d4dd0155dbaf33e5e06ea8202
Signed-off-by: Minh Thai <mthai@google.com>
4 years agoResolveMerger: Ignore merge conflicts if asked so 92/159692/2
Ivan Frade [Wed, 18 Mar 2020 05:29:59 +0000 (22:29 -0700)]
ResolveMerger: Ignore merge conflicts if asked so

The recursive merge strategy builds a virtual ancestor merging
recursively the common bases (when more than one) between the
want-to-merge commits. While building this virtual ancestor, content
conflicts are ignored, but current code doesn't do so when a file is
removed.

This was spotted in [1], for example. Merging two commits to build the
virtual ancestor bumped into a conflict (modified in one side, deleted
in the other) that stopped the process.

Follow the "spec" and in case of conflict leave the unmerged content in
the index and working trees.

[1] https://android-review.googlesource.com/c/kernel/common/+/1228962

Change-Id: Ife9c32ae3ac3a87d3660fa1242e07854b65169d5
Signed-off-by: Ivan Frade <ifrade@google.com>
4 years agoUpgrade spotbugs-maven-plugin to 4.0.0 89/159489/3
David Pursehouse [Tue, 17 Mar 2020 00:20:12 +0000 (09:20 +0900)]
Upgrade spotbugs-maven-plugin to 4.0.0

Change-Id: I28369d116eff053e27d6853a3df914e58120fde5
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoUpgrade maven-javadoc-plugin to 3.2.0 88/159488/2
David Pursehouse [Tue, 17 Mar 2020 00:18:55 +0000 (09:18 +0900)]
Upgrade maven-javadoc-plugin to 3.2.0

Change-Id: I355ca6ad9e050bf46d49a6f91365d86213d84b94
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoUpgrade maven-dependency-plugin to 3.1.2 81/159281/2
David Pursehouse [Fri, 13 Mar 2020 00:05:32 +0000 (09:05 +0900)]
Upgrade maven-dependency-plugin to 3.1.2

Change-Id: I48b4b8366404b01e394bb2dac08e19f0eebbd759
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoMerge "tag option for clone command"
Christian Halstrick [Sun, 15 Mar 2020 22:11:14 +0000 (18:11 -0400)]
Merge "tag option for clone command"

4 years agotag option for clone command 70/159170/3
Alexander Nittka [Wed, 11 Mar 2020 10:58:03 +0000 (11:58 +0100)]
tag option for clone command

Allow explicitly setting the tag option for the remote configuration
when cloning a repository.

Bug: 561021
Change-Id: Iac43268a2bb231ae7599c3255bf555883d34fa32
Signed-off-by: Alexander Nittka <alex@nittka.de>
4 years agoSet baseline for japicmp to 5.7.0.202003110725-r 75/159275/2
Thomas Wolf [Thu, 12 Mar 2020 18:59:31 +0000 (19:59 +0100)]
Set baseline for japicmp to 5.7.0.202003110725-r

Change-Id: Ifef50c9e58c6973676fd24888344e4e1621d0427
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
4 years agoRevWalk: fix bad topo flags error message 67/159267/1
Alex Spradlin [Thu, 12 Mar 2020 16:04:36 +0000 (09:04 -0700)]
RevWalk: fix bad topo flags error message

The error message for an Exception thrown by StartGenerator when given
both the TOPO flag and the TOPO_KEEP_BRANCH_TOGETHER flag mentions a
non-existent flag, TOPO_NON_INTERMIX. The error message was introduced
in commit e498d43.

Replace TOPO_NON_INTERMIX with TOPO_KEEP_BRANCH_TOGETHER in the error
message of an Exception thrown by the StartGenerator when the TOPO flag
is provided together with the TOPO_KEEP_BRANCH_TOGETHER flag.

Signed-off-by: Alex Spradlin <alexaspradlin@google.com>
Change-Id: Id24640dc08e96a196508fe38ce144aa7e035082f

4 years agoMerge "RevWalk: new topo sort to not mix lines of history"
Jonathan Nieder [Thu, 12 Mar 2020 00:00:08 +0000 (20:00 -0400)]
Merge "RevWalk: new topo sort to not mix lines of history"

4 years agoRevWalk: new topo sort to not mix lines of history 49/158449/7
Alex Spradlin [Wed, 26 Feb 2020 23:31:37 +0000 (15:31 -0800)]
RevWalk: new topo sort to not mix lines of history

The topological sort algorithm in TopoSortGenerator for RevWalk may mix
multiple lines of history, producing results that differ from C git's
git-log whose man page states: "Show no parents before all of its
children are shown, and avoid showing commits on multiple lines of
history intermixed." Lines of history are mixed because
TopoSortGenerator merely delays producing a commit until all of its
children have been produced; it does not immediately produce a commit
after its last child has been produced.

Therefore, add a new RevSort option called TOPO_KEEP_BRANCH_TOGETHER
with a new topo sort algorithm in TopoNonIntermixGenerator. In the
Generator, when the last child of a commit has been produced, unpop
that commit so that it will be returned upon the subsequent call to
next(). To avoid producing duplicates, mark commits that have not yet
been produced as TOPO_QUEUED so that when a commit is popped, it is
produced if and only if TOPO_QUEUED is set.

To support nesting with other generators that may produce the same
commit multiple times like DepthGenerator (for example, StartGenerator
does this), do not increment parent inDegree for the same child commit
more than once.

Commit b5e764abd21bd4593287361a625ecc49bc0efd77 modified the existing
TopoSortGenerator to avoid mixing lines of history, but it was reverted
in e40c38ab08837473375c571c2f07ab680fc1985d because the new behavior
caused problems for EGit users. This motivated adding a new Generator
for the new behavior.

Signed-off-by: Alex Spradlin <alexaspradlin@google.com>
Change-Id: Icbb24eac98c00e45c175b01e1c8122554f617933

4 years agoUpgrade maven-site-plugin to 3.9.0 87/159187/1
David Pursehouse [Wed, 11 Mar 2020 14:00:18 +0000 (23:00 +0900)]
Upgrade maven-site-plugin to 3.9.0

Change-Id: I966a05b499d3853c39bc3da8c7e5a1abc11d398e
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoUpgrade build-helper-maven-plugin to 3.1.0 86/159186/1
David Pursehouse [Wed, 11 Mar 2020 13:59:48 +0000 (22:59 +0900)]
Upgrade build-helper-maven-plugin to 3.1.0

Change-Id: Iec821c7312ce185d29e64ee6f9852437e2bd99c4
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoPrepare 5.7.1-SNAPSHOT builds 89/159189/1
Matthias Sohn [Wed, 11 Mar 2020 12:35:23 +0000 (13:35 +0100)]
Prepare 5.7.1-SNAPSHOT builds

Change-Id: I29cd1b9872603810f9c4d42424ac326fedf5569f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoJGit v5.7.0.202003110725-r 77/159177/1 v5.7.0.202003110725-r
Matthias Sohn [Wed, 11 Mar 2020 12:24:54 +0000 (13:24 +0100)]
JGit v5.7.0.202003110725-r

Change-Id: Ia4a9122eeb4eea0f379f6611984cfe1143a32f8d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoTransportHttp: support HTTP response 308 Permanent Redirect 94/159094/2
Thomas Wolf [Mon, 9 Mar 2020 22:41:37 +0000 (23:41 +0100)]
TransportHttp: support HTTP response 308 Permanent Redirect

RFC 7538[1] added HTTP response code 308, signifying a permanent
redirect that, contrary to the older 301, does not allow changing
the request method from POST to GET.

[1] https://tools.ietf.org/html/rfc7538

Bug: 560936
Change-Id: Ib65f3a3ed75db51d74d1fe81d4abe6fe92b0ca12
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
4 years agoRemove unused API problem filters 93/159093/2
Thomas Wolf [Tue, 10 Mar 2020 06:38:15 +0000 (07:38 +0100)]
Remove unused API problem filters

Change-Id: I137cddaf0aecdf9f4bd1427fa9c1af1af4f5b546

4 years agoMerge branch 'stable-5.7' 78/159078/1
Matthias Sohn [Mon, 9 Mar 2020 23:42:10 +0000 (00:42 +0100)]
Merge branch 'stable-5.7'

* stable-5.7:
  Prepare 5.7.1-SNAPSHOT builds
  JGit v5.7.0.202003090808-r
  Prepare 5.7.0-SNAPSHOT builds
  JGit v5.7.0.202002241735-m3

Change-Id: Ibaf382bb2337ca8099f891d4364cebe0b85b095d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoPrepare 5.7.1-SNAPSHOT builds 75/159075/1
Matthias Sohn [Mon, 9 Mar 2020 22:37:43 +0000 (23:37 +0100)]
Prepare 5.7.1-SNAPSHOT builds

Change-Id: I23748c20b69a1cfb47c5cd0d7858182d376b3ce1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoPrepare 5.8.0-SNAPSHOT builds 73/159073/1
Matthias Sohn [Mon, 9 Mar 2020 21:47:10 +0000 (22:47 +0100)]
Prepare 5.8.0-SNAPSHOT builds

Change-Id: I056b45806a82eae80177932e42e3dc806015351a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoJGit v5.7.0.202003090808-r 34/159034/1 v5.7.0.202003090808-r
Matthias Sohn [Mon, 9 Mar 2020 13:09:24 +0000 (14:09 +0100)]
JGit v5.7.0.202003090808-r

Change-Id: Ia23bffa3952687f6107d496a8932d54b11c12412
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoMerge branch 'master' into stable-5.7 88/158988/1
Matthias Sohn [Sat, 7 Mar 2020 20:09:48 +0000 (21:09 +0100)]
Merge branch 'master' into stable-5.7

* master:
  Silence API errors introduced by 093fbbd1
  Bump Bazel version to 2.2.0
  Add validation to hex decoder
  Expose FileStoreAttributes.setBackground()
  Update reftable storage repo layout
  Add 4.14 and 4.15-staging target platforms
  Update Orbit to R20200224183213 for final 2020-03
  Update Orbit to S20200224183213 for 2020-03 RC1
  Cygwin expects forward slashes for commands to be run via sh.exe
  [releng] Update year in copyright notices for features
  Using for-each loop in jdt
  Make Logger instances final
  Move array designators from the variable to the type
  ObjectWalk: Add null check before skip tree.
  Revert "RevWalk: stop mixing lines of history in topo sort"
  Do not fail if known hosts file does not contain valid host key

Change-Id: Ie7841d917b02c3579c4766e7214d6b1656c5f200

4 years agoMerge branch 'stable-5.6' 63/158863/2
Matthias Sohn [Thu, 5 Mar 2020 14:43:48 +0000 (15:43 +0100)]
Merge branch 'stable-5.6'

* stable-5.6:
  Silence API errors introduced by 093fbbd1
  Bump Bazel version to 2.2.0
  Expose FileStoreAttributes.setBackground()
  Update reftable storage repo layout

Change-Id: I237eaaed7991e8bbd56a7624f47bbba985330026
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoSilence API errors introduced by 093fbbd1 51/158851/1
Matthias Sohn [Thu, 5 Mar 2020 12:53:10 +0000 (13:53 +0100)]
Silence API errors introduced by 093fbbd1

Change-Id: I1c9d5a25bd06a1152e953c45b683375cb05aa254
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoBump Bazel version to 2.2.0 34/158834/1
David Pursehouse [Thu, 5 Mar 2020 04:13:47 +0000 (13:13 +0900)]
Bump Bazel version to 2.2.0

Change-Id: I889052040f31708c6b8de0cf3c171a04722f7c96
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoAdd validation to hex decoder 73/158773/3
Michael Dardis [Wed, 4 Mar 2020 04:25:09 +0000 (15:25 +1100)]
Add validation to hex decoder

Does not fix any issue but prevents user from shooting themselves in the
foot with improper configuration.

Suggested by Demetr Starshov at https://git.eclipse.org/r/#/c/157681/

Change-Id: I006d65022f0a7d4066970825d00080c59404fdc3
Signed-off-by: Michael Dardis <git@md-5.net>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoExpose FileStoreAttributes.setBackground() 53/158353/3
Alex Blewitt [Tue, 25 Feb 2020 21:14:59 +0000 (21:14 +0000)]
Expose FileStoreAttributes.setBackground()

The FS.setAsyncFileStoreAttributes() static method calls
FileStoreAttributes.setBackground() as its implementation, but there are
other public attributes on this inner class already and there isn't a
real reason why this needs to be private.

By making it public we allow callers to be able to invoke it directly.
Although it doesn't appear that it would make a difference, by calling a
static method on the FS class, all static fields and the transitive
closure of class dependencies must be loaded and initialised, which can
be non-trivial.

Callers referring to FS.setAsyncFileStoreAttributes() may be replaced
with FS.FileStoreAttributes.setBackground() with no change of behaviour
other than improved performance due to less class loading required.

Bug: 560527
Change-Id: I9538acc90da8d18f53fd60d74eb54496857f93a5
Signed-off-by: Alex Blewitt <alex.blewitt@gmail.com>
4 years agoUpdate reftable storage repo layout 90/157990/9
Han-Wen Nienhuys [Tue, 18 Feb 2020 19:44:10 +0000 (20:44 +0100)]
Update reftable storage repo layout

The change Ic0b974fa (c217d33, "Documentation/technical/reftable:
improve repo layout") defines a new repository layout, which was
agreed with the git-core mailing list.

It addresses the following problems:

* old git clients will not recognize reftable-based repositories, and
  look at encompassing directories.

* Poorly written tools might write directly into
  .git/refs/heads/BRANCH.

Since we consider JGit reftable as experimental (git-core doesn't
support it yet), we have no backward compatibility. If you created a
repository with reftable between mid-Nov 2019 and now, you can do the
following to convert:

  mv .git/refs .git/reftable/tables.list
  git config core.repositoryformatversion 1
  git config extensions.refStorage reftable

Change-Id: I80df35b9d22a8ab893dcbe9fbd051d924788d6a5
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoAdd 4.14 and 4.15-staging target platforms 07/158707/1
Matthias Sohn [Mon, 2 Mar 2020 21:29:03 +0000 (22:29 +0100)]
Add 4.14 and 4.15-staging target platforms

- copy old 4.14-staging to 4.14 target platform
- create 4.15-staging target platform from former 4.14-staging

Change-Id: I874f552205f1bc419334e4f66ebfef4cbc8cb4ff
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoUpdate Orbit to R20200224183213 for final 2020-03 02/158702/1
Matthias Sohn [Mon, 2 Mar 2020 21:07:14 +0000 (22:07 +0100)]
Update Orbit to R20200224183213 for final 2020-03

Change-Id: I00eb77ec4c055de0e5900a2c4ed82770e2031dab
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoMerge "ObjectWalk: Add null check before skip tree."
Jonathan Nieder [Mon, 2 Mar 2020 18:37:59 +0000 (13:37 -0500)]
Merge "ObjectWalk: Add null check before skip tree."

4 years agoUpdate Orbit to S20200224183213 for 2020-03 RC1 17/158617/1
Matthias Sohn [Fri, 28 Feb 2020 23:07:39 +0000 (00:07 +0100)]
Update Orbit to S20200224183213 for 2020-03 RC1

Change-Id: Ic37b1b8dc62de0bb30fa50562bed428f49d404bc
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoMerge branch 'stable-5.6' 16/158616/1
Matthias Sohn [Fri, 28 Feb 2020 22:53:17 +0000 (23:53 +0100)]
Merge branch 'stable-5.6'

* stable-5.6:
  Cygwin expects forward slashes for commands to be run via sh.exe
  Make Logger instances final
  Move array designators from the variable to the type

Change-Id: I9a5dc570deb478525bf48ef526d8cba5b19418bf
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoCygwin expects forward slashes for commands to be run via sh.exe 38/158538/2
Thomas Wolf [Thu, 27 Feb 2020 19:04:47 +0000 (20:04 +0100)]
Cygwin expects forward slashes for commands to be run via sh.exe

FS_Win32_Cygwin replaces backslashes by / as a side-effect of
relativize(). When support for core.hooksPath was added, paths were
relativized in a different place using Path.resolve(), which doesn't
do that transformation. As a result hooks could not be run on Cygwin
in some cases.

Do the transformation in FS_Win32_Cygwin.runInShell(). In all other
places, File or Path objects are used, which give no guarantee about
the file separator (typically the system-dependent default separator),
so doing the transformation earlier still wouldn't guarantee that
sh.exe indeed gets a command string using forward slashes.

Bug: 558577
Change-Id: I3c07eb85f0ac7c5628a2e92f990e5cdb7ecf532f
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
4 years agoMerge "[releng] Update year in copyright notices for features"
David Pursehouse [Fri, 28 Feb 2020 13:40:40 +0000 (08:40 -0500)]
Merge "[releng] Update year in copyright notices for features"

4 years ago[releng] Update year in copyright notices for features 51/158551/2
Thomas Wolf [Thu, 27 Feb 2020 23:32:50 +0000 (00:32 +0100)]
[releng] Update year in copyright notices for features

Bump upper end of range to 2020.

These copyright notices are user-facing; they're visible in several
dialogs in Eclipse. It is strange or even misleading to see a copyright
notice for JGit saying "2005, 2010" when there have been *many*
developments in the past ten years.

Change-Id: Idaa6244b2b3d9cecb29cc690085f8d008195cf12
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
4 years agoUsing for-each loop in jdt 82/158482/2
Lars Vogel [Thu, 27 Feb 2020 10:05:23 +0000 (11:05 +0100)]
Using for-each loop in jdt

Running the JDT cleanup action for using a for-each loop on jgit

Change-Id: Ie724d8bbdff786ab0167089e90a9914a8135103c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
4 years agoMake Logger instances final 96/158496/1
David Pursehouse [Thu, 27 Feb 2020 11:32:29 +0000 (20:32 +0900)]
Make Logger instances final

Change-Id: Ibb997952917e47bc31a8cbe3863623bc959a8100
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoMove array designators from the variable to the type 95/158495/1
David Pursehouse [Thu, 27 Feb 2020 11:27:31 +0000 (20:27 +0900)]
Move array designators from the variable to the type

As reported by Sonar Lint:

Array designators should always be located on the type for better code
readability. Otherwise, developers must look both at the type and the
variable name to know whether or not a variable is an array.

Change-Id: If6b41fed3483d0992d402d8680552ab4bef89ffb
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
4 years agoMerge "Revert "RevWalk: stop mixing lines of history in topo sort""
Jonathan Nieder [Wed, 26 Feb 2020 22:48:18 +0000 (17:48 -0500)]
Merge "Revert "RevWalk: stop mixing lines of history in topo sort""

4 years agoObjectWalk: Add null check before skip tree. 71/158371/3
Yunjie Li [Wed, 26 Feb 2020 01:29:38 +0000 (17:29 -0800)]
ObjectWalk: Add null check before skip tree.

currVisit could be null if a blob is marked as start point in
ObjectWalk. Add null check before skipping current tree.

Change-Id: Ic5d876fe2800f3373d136979be6c27d1bbd38dc1
Signed-off-by: Yunjie Li <yunjieli@google.com>
4 years agoRevert "RevWalk: stop mixing lines of history in topo sort" 28/158428/3
Alex Spradlin [Wed, 26 Feb 2020 18:49:41 +0000 (13:49 -0500)]
Revert "RevWalk: stop mixing lines of history in topo sort"

This reverts commit b5e764abd21bd4593287361a625ecc49bc0efd77.

PlotWalk uses the TopoSortGenerator, which is causing problems for EGit users
who rely on the emission of commits being somewhat based on date as in the
previous topo-sort algorithm.

Bug: 560529
Change-Id: I3dbd3598a7aeb960de3fc39352699b4f11a8c226
Signed-off-by: Alex Spradlin <alexaspradlin@google.com>
4 years agoDo not fail if known hosts file does not contain valid host key 62/158362/7
Lajos Olah [Tue, 25 Feb 2020 22:17:02 +0000 (17:17 -0500)]
Do not fail if known hosts file does not contain valid host key

KnownHosts (implementing HostKeyRepository) in Jsch can return null
which could cause NullPointerException in Stream.of(...)

Change-Id: Iddcf5f34f8c8475a85ca7ae018bbe48d1b3fbbc0
Signed-off-by: Lajos Olah <lajos.olah.jr@gmail.com>
4 years agoPrepare 5.7.0-SNAPSHOT builds 88/158288/1
Matthias Sohn [Tue, 25 Feb 2020 10:25:02 +0000 (11:25 +0100)]
Prepare 5.7.0-SNAPSHOT builds

Change-Id: Ic4c83c0ed6cdef69890cc9c27b3aa35c3ff66240
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoJGit v5.7.0.202002241735-m3 66/158266/1 v5.7.0.202002241735-m3
Matthias Sohn [Mon, 24 Feb 2020 22:34:11 +0000 (23:34 +0100)]
JGit v5.7.0.202002241735-m3

Change-Id: I9f71835ed9a0a1176f7ac99edf45d9ce97080720
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoMerge branch 'master' into stable-5.7 54/158254/1
Matthias Sohn [Mon, 24 Feb 2020 20:13:22 +0000 (21:13 +0100)]
Merge branch 'master' into stable-5.7

* master:
  Update Orbit to S20200219023850 for 2012-03 M3
  Revert "Prepend hostname to subsection used to store file timestamp resolution"
  Remove use of org.bouncycastle.util.encoders.Hex
  Remove use of org.bouncycastle.util.io.TeeOutputStream
  Make the IMatcher public API
  SimilarityRenameDetector: Fix inconsistent indentation
  Use indexOf(char) and lastIndexOf(char) rather than String versions
  Reorder modifiers to follow Java Language Specification
  GitmoduleEntry: Remove redundant import of class from same package
  Remove redundant "static" qualifier from enum declarations
  RevWalk: stop mixing lines of history in topo sort
  Upgrade plexus-compiler-{eclipse|javac|javac-errorprone} to 2.8.6
  Upgrade maven-shade-plugin to 3.2.2
  Removed unused imports
  Documentation/technical/reftable: improve repo layout

Change-Id: I558eff2abda44342fbaf1662fda07e2bcc6d4ee3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoUpdate Orbit to S20200219023850 for 2012-03 M3 90/158190/1
Matthias Sohn [Sun, 23 Feb 2020 22:51:53 +0000 (23:51 +0100)]
Update Orbit to S20200219023850 for 2012-03 M3

Change-Id: I7b216fa9a4d0724fa7723713b6dd57e269a5e8fe
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoMerge branch 'stable-5.6' 39/158139/2
Matthias Sohn [Sat, 22 Feb 2020 22:29:14 +0000 (23:29 +0100)]
Merge branch 'stable-5.6'

* stable-5.6:
  Revert "Prepend hostname to subsection used to store file timestamp resolution"
  SimilarityRenameDetector: Fix inconsistent indentation
  Use indexOf(char) and lastIndexOf(char) rather than String versions
  Reorder modifiers to follow Java Language Specification
  GitmoduleEntry: Remove redundant import of class from same package
  Remove redundant "static" qualifier from enum declarations

Change-Id: Ibb66bef7e8373f81e3e653c9843d986243446d68
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
4 years agoRevert "Prepend hostname to subsection used to store file timestamp resolution" 38/158138/1
Matthias Sohn [Sat, 22 Feb 2020 21:51:32 +0000 (22:51 +0100)]
Revert "Prepend hostname to subsection used to store file timestamp resolution"

This reverts commit e102bbed995f0e6d3a1a8e5db6d08f9804fd3260.

Resolving the hostname comes with a performance penalty. We no longer
store the timestamp resolution in the global git config which might be
copied around to other machines but in a dedicated jgit config meant for
automatically determined options like timestamp resolution. Hence there
is no strong reason anymore to have a hardware specific identifier in
the subsection name of file timestamp resolution options.

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