Christian Halstrick
0e3ddea1b0
Add "--long" option to JGit describe
...
Native git supports "git describe --long". This will enforce returning a
long description of a commit even if a tag is directly pointing to the
commit (in contrast to just returning the tag name as it is now). This
commit teaches JGits DescribeCommand and the describe command in the pgm
package to support "--long".
Bug: 460991
Change-Id: I65e179b79e89049c6deced3c71cb3ebb08ed0a8f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
9b486e3906
Prepare 3.7.1-SNAPSHOT builds
...
Change-Id: I2e97610ea9e552e5800e7ca895fd193c8bc507aa
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
a312131d79
JGit v3.7.0.201502260915-r
...
Change-Id: Iec17746cad81cfb1d775e782b30f9d8a13c938b6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
c26bc63ef1
Set minimum required Java version to Java 7
...
Bug: 458475
Change-Id: Iea8f2236d4e6a94a8d14bb8cc685006ea3fd1bb7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Rüdiger Herrmann
fc801dd79f
Add option --orphan for checkout
...
Change-Id: I546a93f3e147d8d6fc70094b22679c0d11cd8921
Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de>
10 years ago
Matthias Sohn
3c2b4086b6
Prepare post 3.7.0.201502031740-rc1 builds
...
Change-Id: Id3728e771a4441757de016cc9d68055f668126b0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
8fe6e51be2
JGit v3.7.0.201502031740-rc1
...
Change-Id: Ia2ea65945b7e1d4120da3d6e6c9f6d5fdb642ae6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
94ebdbfada
Prepare 4.0.0-SNAPSHOT builds
...
Change-Id: I414ba8ccc82866d3107ba7083a567ea70c879bdf
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
58f3ecea9b
Prepare 3.6.3-SNAPSHOT builds
...
Change-Id: Ie753dc77a23558d1993e959f48b7eb06557ea686
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
debb1e25d1
JGit v3.6.2.201501210735-r
...
Change-Id: I483fc7bbff1561721cf621dc67ce4a193624fa64
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
741ebca8b7
Prepare 3.6.2-SNAPSHOT builds
...
Change-Id: I9699d84af2d4b5382d8ee88ed3517d6b91305421
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
f1b2a5361f
JGit v3.6.1.201501031845-r
...
Change-Id: I56e235a271f90ea2d8cdb7d99706f726d4a59c43
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
cdfd22da30
Prepare 3.7.0-SNAPSHOT builds
...
Change-Id: Ib3e7b5f46ee1e27b9cf25b3b2d01d681a5c4904c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
02b0660b8b
Prepare 3.6.1-SNAPSHOT builds
...
Change-Id: Ie620c90ffafbffc6755b4e1ed55a61a15b118a2a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
b2ca2ffd7d
JGit v3.6.0.201412230720-r
...
Change-Id: Ic28e2bbbdb1099e948c64a005c39f6b8d8ac69a8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
15e8b4fb2e
[pgm] Add option --bare to clone command
...
Change-Id: I528491e3e20d3c9ebe37fe3cd2bf85b4644d8698
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
563c1ad514
[pgm] Implement clone using CloneCommand
...
Change-Id: I56699b7bf9a71f673cb308d3015f51de5b06c1d9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
8899006c09
JGit v3.5.3.201412180710-r
...
Change-Id: Iadbd460da494c04fba71f98c200d6b65ce1709c6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
dbe8b52c5c
JGit v3.4.2.201412180340-r
...
Change-Id: Ie088cf129b04ec64738edbc8c3ce25aa43b557ca
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
Matthias Sohn
8812e6f3f6
[pgm] Add option --tags for ls-remote
...
Bug: 444072
Change-Id: I52b470924609fc201e078d9d232aad257506728d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 years ago
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