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
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
Matthias Sohn
50d8cf5ca5
JGit v3.3.2.201404171909-r
...
Change-Id: I1d7e40156d0b6e30bd5f3a40f18c836b7d1ba78f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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
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
Matthias Sohn
f839d383e6
Prepare post 3.2.0 builds
...
Change-Id: Ie2bfdee0c492e3d61d92acb04c5bef641f5f132f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
699900c308
JGit v3.2.0.201312181205-r
...
Change-Id: Id00a8baf7d3ffefb210f03cd99f69d55411166fe
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
b14a939718
Prepare 3.3.0-SNAPSHOT builds
...
Change-Id: I7c7e7c1beec0c5d15b96c14c73ce93e3f09855c8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
fceae20181
Prepare post 3.2.0-m3 builds
...
Change-Id: I6ef4aa758a6a5d465d4c460178ca3050b8a30449
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
11ad807f7a
JGit v3.2.0.201311130903-m3
...
Change-Id: Icca089f4a60cc94123dc8bf61f7f76f501e08c4d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
b6cf49b2bd
Don't import non-existing package org.eclipse.jgit.java7
...
Change-Id: Idc48cb1995050913498d2bad97a8e6e330dee94c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Kaloyan Raev
40e8ba4186
CLI fetch command should support --tags
...
Bug: 419638
Change-Id: I1dc99fd38e678e091a1d141d741328f0dec1756a
Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
11 years ago
Matthias Sohn
7995d87713
Prepare 3.2.0-SNAPSHOT builds
...
Change-Id: Iac6cf7a5bb6146ee3fe38abe8020fc3fc4217584
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
da6e87bc37
Prepare post 3.1.0 builds
...
Change-Id: I306a3d40c6ddb88a16d17f09a60e3d19b0716962
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
16ca725b35
JGit v3.1.0.201310021548-r
...
Change-Id: I2170b13047d5eab7565f47f9feb1680e03b1ba09
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
5a2a2222ef
Prepare post 3.1.0 RC1 builds
...
Change-Id: I060f2082ccd0c91905b6b29a49cc633a0b51a1f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
6f0681eb9f
JGit v3.1.0.201309270735-rc1
...
Change-Id: I48202dd461110da25f9bc159c938311fff0669e0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
85fae93539
JGit v3.0.3.201309161630-r
...
Change-Id: I73ff609ba681500394b5919f62cff9ec24a52756
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
3af38b4fee
Prepare post 3.0.2 builds
...
Change-Id: Ie1bd951a2cb35d069c94dab4a62507115913764f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
da3041ae73
JGit v3.0.2.201311090911-r
...
Change-Id: Ifaae2e3e2f1bb0504bf9e6d59983086ac19a540b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
e243988e9e
Add missing dependency for testing ArchiveCommand with xz compression
...
Without this dependency the ArchiveTest.testTxzExtension() fails with a
ClassNotFoundException if it is started from Eclipse.
Change-Id: Ief2fceaaffab7641ba63ace4577462fa3bbf1c13
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
4eefa881b3
Prepare post 3.0.2-rc2 builds
...
Change-Id: I0e4020326c6443ba7157c18b345160cf9e1e88a7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
7c37177952
JGit v3.0.2.201309041250-rc2
...
Change-Id: Ie18ced75f573f140969af2a7d9edb45c76523715
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
fdd1ac930e
Prepare 3.0.2-SNAPSHOT builds
...
Change-Id: I3287609a90f068017cc62f4fd7738651e0663081
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
11 years ago
Matthias Sohn
6b9c0d1232
Prepare 3.1.0-SNAPSHOT builds
...
Change-Id: I7490a7c9558423c03e3c167ad55b9a98be9d99d9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Matthias Sohn
01f6d91476
Prepare post 3.0.0.201306101825-r builds
...
Change-Id: I299cf1addc0987ffe39140d2216ab6a98e95ce52
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Matthias Sohn
f384644774
JGit v3.0.0.201306101825-r
...
Change-Id: Ie8deab94c6263b5198f0bcb4533b1cfb3f5724b1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Matthias Sohn
bf388c2e32
Prepare post 3.0.0 RC3 builds
...
Change-Id: I008d55e2ef0aac9d1877b05ba73e3cf26335d430
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Matthias Sohn
a898836eac
JGit v3.0.0.201306040240-rc3
...
Change-Id: I8b782e9ebe03e5f72611a21a76d80c6b20cb7845
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Matthias Sohn
0603519aad
Prepare post 3.0.0-rc2 builds
...
Change-Id: Ic46832bcde80d0bf74c16cb094abd76b00552d14
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Matthias Sohn
30fad6758f
JGit v3.0.0.201305281830-rc2
...
Change-Id: I490ad8cc7590f70783d3fbd6dd6f0e0446ae5afe
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Matthias Sohn
4800ac50f9
Prepare post 3.0.0 M7 builds
...
Change-Id: I062c44529c7ae2f960d3c64a0923a45d2dc8a863
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Matthias Sohn
00108d01ff
JGit v3.0.0.201305080800-m7
...
Change-Id: I377b174993862918a117f54e6cba4733dfc2307c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Matthias Sohn
d7cc6eb002
Move org.eclipse.jgit.pgm's resource bundle to internal package
...
Translatable texts aren't API and shouldn't require maintenance of
@since tags to prevent API warnings.
Change-Id: I228ff37f17c0e792a6bc188c463a0d19138e88ac
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Robin Rosenberg
dd3181603e
Extend the FS class for Java7
...
The most important difference is that in Java7 we have symbolic links
and for most operations in the work tree we want to operate on the link
itself rather than the link target, which the old File methods generally
do.
We also add support for the hidden attribute, which only makes sense
on Windows and exists, just since there are claims that Files.exists
is faster the File.exists.
A new bundle is only activated when run with a Java7 execution
environment. It is implemented as a fragment.
Tycho currently has no way to conditionally include optional features
based on the java version used to run the build, this means with this
change the jgit packaging build always needs to be run using java 7.
Change-Id: I3d6580d6fa7b22f60d7e54ab236898ed44954ffd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago
Matthias Sohn
135a78cfcb
Remove unused dependencies
...
Change-Id: I3cd161ac360a2e2635bffe309725a41c9527694e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years ago