Matthias Sohn
490660a7c6
[pgm] Add option --heads for ls-remote
...
TODO: find a way to use option -h which is already captured by
TextBuiltin's option --help which also uses the alias -h.
Bug: 444072
Change-Id: Ie66584c2fc7fc224014a43cf928547703dd9d213
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
816de9e9fa
[pgm] Use LsRemoteCommand to implement ls-remote and add a test
...
Change-Id: Ic266f844c23e2519df5770ca56284b26e4cfe1f4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
5672535360
Prepare post 3.6.0-m1 builds
...
Change-Id: Ie9927de64fa6b7d517f96b8cd12e57541f284ff2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
1555eeaa9c
JGit v3.6.0.201411121045-m1
...
Change-Id: I9d789113d88cbbbdbabb8919f80c805aa4ba86fe
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
3521712032
Prepare 3.5.3-SNAPSHOT builds
...
Change-Id: Ia37eb66a0deaf6e86a726b1b12eaea25416d4a36
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
b5e5abcf4d
JGit v3.5.2.201411120430-r
...
Change-Id: I217d25ee712cbde52bc9319ef1dd15d2f571d37a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
dcb52291a9
Prepare 3.5.2-SNAPSHOT builds
...
Change-Id: Ib2ccdebe80bad0b09d2d31889a3ab89d77e341f6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
450ce163ef
JGit v3.5.1.201410131835-r
...
Change-Id: I37e049c8e81f963cfb7c17f1af91fd4245766aee
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
848186da86
Prepare 3.5.1-SNAPSHOT builds
...
Change-Id: Ibf89f996c9d9a7e431ee09261987bb76246de441
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
24a2f9e53d
JGit v3.5.0.201409260305-r
...
Change-Id: Ibf382bda3dcbb4b70829b1dd3a8abfd07bc4879e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
66559681dd
Prepare post 3.5.0-rc1 builds
...
Change-Id: Id9e01b867bff0ed10e887c15a12e5399b788b68e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
48820c7b07
JGit 3.5.0.201409071800-rc1
...
Change-Id: I59e5e2492820da111df1837fbf3649a2ae03841c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
6ccf609e89
Prepare 3.6.0-SNAPSHOT builds
...
Change-Id: I2d8c3768998c0cfc8d02d11009bc5b7ed1d75778
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Axel Richard
46f3007b52
Handle -m option for Merge command
...
Set the commit message to be used for the merge commit (in case one is
created)
Bug: 442886
Change-Id: Ie5ecc13822faa366f00b3daa07f74c8441cae195
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Yuxuan 'fishy' Wang
73d38bfb33
Strip trailing /s in repo base URI.
...
Change-Id: I71040db2cca69638cfad89acdc9179ee80592b27
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
10 years ago
Robin Rosenberg
fd58cbcdee
Don't prefix output from jgit status with '# '
...
C Git does not do it anymore
Bug: 439937
Change-Id: I20bdb787a00bba3e4adf269fd64ec6296bdc2a66
11 years ago
Robin Rosenberg
a03bdcbbb4
Don't warn for methods that can be static
...
Making the methods static would gain little in performance,
make the code harder to change. Removing unncessary warnings
is more important.
Change-Id: If3e6aa9c1d92e58b4e7a8e246cf4aace237d7a7b
11 years ago
Robin Rosenberg
8032b64980
Add new default settings from Eclipse 4.4
...
These settings were added by Eclipse simply by touching
the project settings. Adding these makes it simpler to see
what local changes have been made.
Change-Id: Iab0aa62530312eb0c78b03b5c6a632742bcc4978
11 years ago
Matthias Sohn
7865d7100e
Prepare 3.4.2-SNAPSHOT builds
...
Change-Id: If88217d84b88cda6d04c159418d5bc86233fe28c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
03f6e83c40
JGit v3.4.1.201406201815-r
...
Change-Id: I4383a90fd91a243cd5ce5d0ae4e53874b36c1f47
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
126eb94f77
Prepare post 3.4.0 builds
...
Change-Id: I49f3741f3973b247a635f7c99b72309d2381a377
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
d0daad884f
JGit v3.4.0.201406110918-r
...
Change-Id: I56543234316f04bff4e45628bcb8286a6e52e31f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Robin Rosenberg
64b0531c35
Prepare 3.5.0-SNAPSHOT builds
...
Change-Id: I53bd500188e09ae2e007a58b3cd89aa0805d6f2a
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
11 years ago
Matthias Sohn
3b83e1a398
Prepare post 3.4 RC3 builds
...
Change-Id: I9730bb349d0295c811aa3a9ba0f67bd946e86d1e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
dd06dcdcf2
JGit v3.4.0.201406041058-rc3
...
Change-Id: If0cfec023788cae7713dd1ccc250e221365ef984
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
386dff2271
Prepare post 3.4.0 RC2 builds
...
Change-Id: Id8d784ba7b0aba7c6a00f459bf1ac54c1d36d061
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
314fade855
JGit v3.4.0.201405281120-rc2
...
Change-Id: Ifd376f58cf867fc84d39582c49e971d998abf63d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
0e13adb9cf
Prepare post 3.4.0 RC1 builds
...
Change-Id: Ia8d29046439bc9134acdf7c88ab85ea49c4ddf47
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
d2d56e9efb
JGit v3.4.0.201405211411-rc1
...
Change-Id: Ia3834770b9719f64cbdfd0338034c392fa3ae5db
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Robin Rosenberg
1a9f122773
Fix a number of failing conflict situations
...
Adds further tests where the working tree is dirty (differs from
index) and where we have staged but uncommitted changes.
Fixed the test case 9 for file/directory conflicts.
Bug: 428819
Change-Id: Ie44a288b052abe936ebb74272d0fefef3b218a7a
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
11 years ago
Robin Rosenberg
19ac1f75ab
Fix failing ConfigTest on Windows
...
Trust the detection of features and just test CoreConfig.
Change-Id: I37f838d270a221a75d0d3842ba2f3f90aa1d6f01
11 years ago
Matthias Sohn
bbf28b1cf4
Command line: implement checkout -- <path>
...
Change-Id: I3d261e6541fe0fcaa210587d2aa226e153071351
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
3a47e45c32
Prepare 3.4.0-SNAPSHOT builds
...
Change-Id: I5cf20c875c3e92e12c2b22465774ba42513b9add
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
f6c42684d9
JGit v3.4.0.201405051725-m7
...
Change-Id: I8d941d22becdf019199a1c0fe28aa5835038647d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Robin Rosenberg
cd1f3ecb92
cleanup: remove some unused imports
...
Change-Id: I549b934b86753acc362364c8986bfe6457affd12
11 years ago
Yuxuan 'fishy' Wang
a44a687fed
Added groups support to repo subcommand.
...
Change-Id: Id0e7663b6ac4f6938fdcacaf2158107b6285fc25
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
11 years ago
Yuxuan 'fishy' Wang
1f3b75c9ee
Added the command line of jgit repo.
...
Change-Id: Ib809b00c236a9c44422a872ae801b060f5b26808
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
11 years ago
Matthias Sohn
50d8cf5ca5
JGit v3.3.2.201404171909-r
...
Change-Id: I1d7e40156d0b6e30bd5f3a40f18c836b7d1ba78f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Robin Rosenberg
c8d2040722
Add launchers for running tests with Java 8
...
Change-Id: I91a7225cff350f11cc224129439622c7dfd9f4f3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Robin Rosenberg
bb9a4850b5
Make sure we include the Java 7 module in tests when using JDK 8
...
Change-Id: Idfb3b16725d8f2ad25338dd0910fb1334c00cde4
11 years ago
Matthias Sohn
5073000c3f
Prepare 3.3.2-SNAPSHOT builds
...
Change-Id: I48271980a258acd0ada7c418b24c61c1bf0a0cd2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
f3f2060b5c
JGit v3.3.1.201403241930-r
...
Change-Id: Ib317903898095d205f0b6ed4cead62ff6eabd894
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Robin Stocker
31fec678d8
Implement "git branch --contains" in pgm
...
Bug: 425678
Change-Id: Ib59e05a0bde58562cc61e6e3000df761660b468e
Signed-off-by: Robin Stocker <robin@nibor.org>
11 years ago
Matthias Sohn
47207e98d4
Prepare 3.4.0-SNAPSHOT builds
...
Change-Id: I907c6f1834c06b8ab4d3e0f76dde475faea7b4a5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
c1fee1d16b
Prepare 3.3.1-SNAPSHOT builds
...
Change-Id: If15560f2731e54dbf9db88d8a308b4c25ce27e8e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
3d855dbfc6
JGit v3.3.0.201403021825-r
...
Change-Id: Iaf3da455f7d6f691617299e881154ff8185a9d46
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Christian Halstrick
73c8e70797
Don't raise checkout conflict for file missing in working tree
...
During a checkout we want to prevent to overwrite unsaved local file
content. Jgit was therefore checking whether the file to overwrite is
dirty or missing and would raise a conflict if this was the case. That
was wrong. It should only check if the file is dirty. It's ok to
"overwrite" a missing/non-existing file.
Change-Id: I63c3a94f663c87f09170fdf8b1b1bf4ed5246fc5
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
11 years ago
Matthias Sohn
3cebf9c466
Prepare post 3.3.0RC1 builds
...
Change-Id: I0d808f8733a490b75bbcaacedb4b095e05fab32e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
8bf45c23df
JGit v3.3.0.201402191814-rc1
...
Change-Id: Ida3a0417ae646ce37214153f49a85de2be3dd4fd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Robin Rosenberg
078a9f6066
Add symlink support to JGit
...
The change includes comparing symbolic links between disk and index,
adding symbolic links to the index, creating/modifying links on
checkout. The behavior is controlled by the core.symlinks setting, just
as C Git does. When a new repository is created core.symlinks will be
set depending on the capabilities of the operating system and Java
runtime.
If core.symlinks is set to true, the assumption is that symlinks are
supported, which may result in runtime errors if this turns out not to
be the case.
Measuring the cost of jgit status on a repository with ~70000 files,
of which ~30000 are tracked reveals a penalty of about 10% for using
the Java7 (really NIO2) support module.
Bug: 354367
Change-Id: I12f0fdd9d26212324a586896ef7eb1f6ff89c39c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago