Matthias Sohn
ce76f773f8
Prepare 4.5.6-SNAPSHOT builds
...
Change-Id: I57c55187ada6d824b94a17f5a79a5bcff61f9ee9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
40366c1cf5
JGit v4.5.5.201812240535-r
...
Change-Id: I6e89e937c08757887967d91afb39cfbe8372d6b5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
7608de5e5d
Prepare 4.5.5-SNAPSHOT builds
...
Change-Id: I71f946f2875716670a2d74c21a8ab38a1f53a25c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago
Matthias Sohn
6372c60ab2
JGit v4.5.4.201711221230-r
...
Change-Id: Ia1079da239c5b3fde1ba8d2acc4e465a46297b4d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago
Matthias Sohn
960d7ff3e5
Prepare 4.5.4-SNAPSHOT builds
...
Change-Id: Id8b902bf2bf590b41f2e246c5ecf1592e1c411f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago
Matthias Sohn
e21e2436d3
JGit v4.5.3.201708160445-r
...
Change-Id: I2d57144976e3683e180d3a42edc6c3bf2905e87c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago
Matthias Sohn
3db0f507ee
Prepare 4.5.3-SNAPSHOT builds
...
Change-Id: I69681b7a5687ca76bd0dd5d3e7ce2cff841d0e32
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
8 years ago
Matthias Sohn
c1d3ecbeab
JGit v4.5.2.201704071617-r
...
Change-Id: I66402643d7c84c90bf5cefed4d2ec3aa68c94cfb
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
8 years ago
Matthias Sohn
11a12ceb0b
Prepare 4.5.2-SNAPSHOT builds
...
Change-Id: I8485de1f3f63dc9ec445b8fb08093ca144aedc59
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
8 years ago
Matthias Sohn
a9a84b7235
JGit v4.5.1.201703201650-r
...
Change-Id: I88de7c9f52abbc4921a82208ed74d22aa19fb3cd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
8 years ago
Matthias Sohn
cb617e7ffc
Prepare 4.5.1-SNAPSHOT builds
...
Change-Id: I3305e8a09a3fb06f25a316cff2bdbb551d3ade68
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
8 years ago
Matthias Sohn
e7142a3937
JGit v4.5.0.201609210915-r
...
Change-Id: Idc02a1a1d74f84605d764c239803f0cfbad94eb7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
8 years ago
Ned Twigg
b67df51203
CLI: implement option -d for deleting tags
...
Change-Id: I438456b76aefd361384729686271288186d3be3b
Signed-off-by: Ned Twigg <ned.twigg@diffplug.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
8 years ago
Ned Twigg
34673f0536
Added a clean command.
...
Change-Id: I05d5392789b5b64e6ee44f678556cf25dc30d7ba
Signed-off-by: Ned Twigg <ned.twigg@diffplug.com>
8 years ago
David Pursehouse
4528d5f56d
Ignore 'The value of exception parameter is not used' warning
...
Change-Id: I50407e4a33e35b718ca40503fdd436f1f9f70fba
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
9 years ago
Matthias Sohn
bcc6b5926f
Prepare 4.4.2-SNAPSHOT builds
...
Change-Id: I1d75fb5bddb1a6dd23604ba57c9798c978afca89
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
df479df176
JGit v4.4.1.201607150455-r
...
Change-Id: I61dbc29a962c8185fb356fe1ca30a1e673166d47
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Christian Halstrick
5fe44ed3ee
Fix DirCacheCheckout to return CheckoutConflictException
...
Problem occurs when the checkout wants to create a file 'd/f' but
the workingtree contains a dirty file 'd'. In order to create d/f the
file 'd' would have to be deleted and since the file is dirty that
content would be lost. This should lead to a CheckoutConflictException
for d/f when failOnConflict was set to true.
This fix also changes jgit checkout semantics to be more like native
gits checkout semantics. If during a checkout jgit wants to delete a
folder but finds that the working tree contains a dirty file at this
path then JGit will now throw an exception instead of silently keeping
the dirty file. Like in this example:
git init
touch b
git add b
git commit -m addB
mkdir a
touch a/c
git add a/c
git commit -m addAC
rm -fr a
touch a
git checkout HEAD~
Change-Id: I9089123179e09dd565285d50b0caa308d290cccd
Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de>
Also-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de>
9 years ago
Matthias Sohn
0900dc08f5
Prepare 4.4.1-SNAPSHOT builds
...
Change-Id: I4fe1c84b1418126f5b245b8a4f72bb7e37f48eae
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
399d2929ee
JGit v4.4.0.201606070830-r
...
Change-Id: I5c771a62ac0420424a655a4025c62a4bc28dc44e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
75b3301939
Prepare 4.5.0-SNAPSHOT builds
...
Change-Id: I572fe9fea0e5ca0bec4648c916ae95a5b1ccf125
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
831c811f61
Prepare 4.4.0-SNAPSHOT builds
...
Change-Id: Ib41dfe4103f013ba87a1ce62ee24bc9e10300eff
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Hugo Arès
f0a485d5a2
Add missing @Test annotations
...
Change-Id: Ie5ffcbf18233dc9b3eb232f714b5b58b6b93f4e0
Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
9 years ago
Matthias Sohn
f3b8653021
JGit v4.4.0.201606011500-rc2
...
Change-Id: Ifd7b7baba7d676a630e2f742d369c4186ea450a6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
9720f9e249
Prepare 4.4.0-SNAPSHOT builds
...
Change-Id: Iba6e423294d3315465648d19087a674a73b5ef28
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
f2c58503d7
JGit v4.4.0.201605250940-rc1
...
Change-Id: Idd8e1664730b979cfbd9a2196081a48a1efa3330
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Rüdiger Herrmann
8ff08994a4
JGit CLI: allow to call git init with specific directory
...
With this change it is possible to initialize repositories with
'git init /path/to/new/repo'
Change-Id: Ia9b288b4fb34887e8f5e2f3f270e521c44d41b6a
Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
4641c43a98
Prepare 4.3.2-SNAPSHOT builds
...
Change-Id: I71997a8be83841765111cb7b55506bd8edd8adad
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
41b194c718
JGit v4.3.1.201605051710-r
...
Change-Id: I25fb72cc17d7a27b0b69746d907dac9ccd4d7997
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
b4c6a41adc
Prepare 4.4.0-SNAPSHOT builds
...
Change-Id: Ib95be1300b1b95cc7e8153170d509282bdc4e328
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
1447159b92
JGit v4.4.0.201605041135-m1
...
Change-Id: Ic9b6d7dae293887c3ac3a11f92e153501abad1dc
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
ccf8363693
Prepare 4.4.0-SNAPSHOT builds
...
Change-Id: If3162f4cc4ae6319b9f1e3293549485b039cfe7f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
ac5d1bc37b
Prepare 4.3.1-SNAPSHOT versions
...
Change-Id: I985828fd379e4596ae7f1c30a87e55df06a7924e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
f2ee537d55
Prepare 4.3.1-SNAPSHOT versions
...
Change-Id: I52c98ba8fb3a303269a1f9380af114b6dd8c5009
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
4f0daa3bb2
JGit v4.3.0.201604071810-r
...
Change-Id: I902cdf1ff92ce8c6e9d80c4965d8d5bd8b9ac6c1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
57e6274bcf
JGit v4.3.0.201604071045-r
...
Change-Id: Iafab78d6be34d31a13f979b7be67611135c0f8bd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
46bef2bcb6
Prepare 4.3-SNAPSHOT builds
...
Change-Id: Ib831f8870938113bd5338763f90a07d5c108b1de
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
bf32c9102f
JGit v4.3.0.201603230630-rc1
...
Change-Id: I10835e5aa3618e5033424595942cc1649152cb24
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
29159f1171
JGit v4.1.2.201602141800-r
...
Change-Id: If0721109f389835a3a00b1a97559fd8f8c156556
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
David Pursehouse
77887b49f9
ReflogTest: Open Git instances in try-with-resource
...
Change-Id: I950b6f16148cfe11de729b04904f88d6e4c28b9a
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
9 years ago
David Pursehouse
ef471b0861
RepoTest: Open Git in try-with-resources
...
Allocate a new Git for each part of the test, rather than
reassigning to the same variable.
Change-Id: Ic83778bbff0b2f57d37b95aef70324859d42cd58
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
9 years ago
Matthias Sohn
fc4d117511
Prepare 4.2.1-SNAPSHOT builds
...
Change-Id: Ic9eac53b10ac97b2038b334d388ae3d21393f993
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
20c2079f70
JGit v4.2.0.201601211800-r
...
Change-Id: I89f33b0da81ff499315baa5311f95f31724fa510
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Matthias Sohn
b30917ce21
Prepare 4.3.0-SNAPSHOT builds
...
Change-Id: Idcf0479529693b023042becd96698f9afd344bd4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
David Pursehouse
72c94465bc
ConfigTest: Create Git instance in try-with-resource
...
Change-Id: Ie65c69e0f1aed95bcdf68ebd68d21b3e2590b41c
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
9 years ago
David Pursehouse
7f84e40f31
CheckoutTest: Create Git instances in try-with-resource
...
Change-Id: I49a03f7bee0b61c062ce160674f9aa0cd1bcc8ba
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
9 years ago
David Pursehouse
9d721de69b
BranchTest: Create Git instances in try-with-resource
...
Change-Id: I8becee479fab91a18e6daffd6f4fd57338c9d120
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
9 years ago
Matthias Sohn
20f272a71c
Prepare 4.2.0-SNAPSHOT builds
...
Change-Id: Ibe38a95bf36db0c0ed948280b28c416943ec0329
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
9 years ago
Andrey Loskutov
7780a4ee31
Make sure CLIGitCommand and Main produce (almost) same results
...
Currently execution of tests in pgm uses CLIGitCommand which
re-implements few things from Main. Unfortunately this can results in a
different test behavior compared to the real CLI runtime.
The change let CLIGitCommand extend Main and only slightly modifies the
runtime (stream redirection and undesired exit() termination).
Change-Id: I87b7b61d1c84a89e5917610d84409f01be90b70b
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
9 years ago
Andrey Loskutov
fb5056c2c5
branch command: print help if requested, even if arguments are wrong
...
git branch -d -h reports an error (because of missing -d option value)
but does not print the help as expected.
To fix this, CmdLineParser must catch, print but do not propagate
exceptions if help is requested.
Bug: 484951
Change-Id: I51265ebe295f22da540792c6a1980b8bdb295a02
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
9 years ago