summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable-3.2'Matthias Sohn2013-12-132-37/+232
|\
| * Don't use API exception in RebaseTodoLineChristian Halstrick2013-12-111-36/+114
| * Merge "Fix aborting rebase with detached head" into stable-3.2Robin Rosenberg2013-12-101-0/+63
| |\
| | * Fix aborting rebase with detached headStefan Lay2013-12-101-0/+63
| * | Add recursive variant of Config.getNames() methodsMatthias Sohn2013-12-061-1/+55
| |/
* / Prepare 3.3.0-SNAPSHOT buildsMatthias Sohn2013-12-052-36/+36
|/
* Implement rebase.autostashStefan Lay2013-12-041-0/+137
* Merge "More helpful InvalidPathException messages (include reason)"Christian Halstrick2013-12-041-1/+1
|\
| * More helpful InvalidPathException messages (include reason)Robin Stocker2013-12-031-1/+1
* | Fix IgnoreRule#isMatch returning wrong result due to missing resetRobin Stocker2013-12-031-0/+12
|/
* Fix exception on conflicts with recursive mergeRobin Stocker2013-12-031-0/+34
* Do not allow non-ff-rebase if there are uncommitted changesStefan Lay2013-12-021-28/+152
* Fix handling of file/folder conflicts during a checkoutChristian Halstrick2013-11-291-0/+25
* Fix applying stash on other commitStefan Lay2013-11-291-0/+87
* Break up GCTest to run in parallelShawn Pearce2013-11-2411-777/+1226
* Modify T0004_PackReaderTest to use existing packShawn Pearce2013-11-241-10/+10
* Move SampleDataRepositoryTestCase to org.eclipse.jgit.testShawn Pearce2013-11-2416-15/+94
* Cache SimpleDateFormat in GitDateParser per localeMatthias Sohn2013-11-233-18/+38
* Fix FIXUP error for blank lines in interactive rebaseStefan Lay2013-11-221-0/+38
* Fix parsing Rebase todo lines when commit message is missingStefan Lay2013-11-211-0/+13
* Add close() method to APIChristian Halstrick2013-11-201-0/+28
* Don't delete .idx file if .pack file can't be deletedChristian Halstrick2013-11-131-0/+36
* [findBugs] Remove nonsense callMatthias Sohn2013-11-101-1/+0
* Remove unnecessary @SuppressWarnings("null")Matthias Sohn2013-11-101-5/+0
* Don't import non-existing package org.eclipse.jgit.java7Matthias Sohn2013-11-101-1/+0
* Interactive Rebase: Do actions if there were conflictsStefan Lay2013-11-081-0/+207
* Rebase interactive should finish if last step is editStefan Lay2013-11-061-0/+33
* Merge changes I40f2311c,I3c419094Matthias Sohn2013-11-051-2/+339
|\
| * Add additional RebaseResult for editing commitsStefan Lay2013-11-051-1/+1
| * Add Squash/Fixup support for rebase interactive in RebaseCommandTobias Pfeifer2013-11-051-1/+338
* | Merge changes I85470d1d,I43711486,Ie6ade781,Ic9ab2b6e,Iebe50933,Id6fac253,Ia6...Shawn Pearce2013-11-0518-76/+201
|\ \ | |/ |/|
| * Use absolute paths for file:// URIs in testsShawn Pearce2013-11-018-29/+42
| * Move repeat() to utility class for testsShawn Pearce2013-11-013-12/+59
| * Remove hardcoded target/trash from test casesShawn Pearce2013-11-013-5/+22
| * Remove dependency on StatusCommandTestShawn Pearce2013-11-013-24/+71
| * Remove dependency on DiffFormatterReflowTestShawn Pearce2013-11-011-6/+7
* | Also use MockSystemReader in GitDateParserBadlyFormattedTestMatthias Sohn2013-11-051-0/+14
* | Merge "testMaliciousPathEmpty fails on Windows"Christian Halstrick2013-11-041-2/+9
|\ \
| * | testMaliciousPathEmpty fails on WindowsRobin Rosenberg2013-11-011-2/+9
| |/
* | Parse commitId and shortMessage of a commented out line in rebase todoTobias Pfeifer2013-10-311-0/+119
* | Enhance reading of git-rebase-todo formatted filesChristian Halstrick2013-10-311-25/+122
|/
* Make sure SystemReader is reset after test is runRobin Stocker2013-10-224-0/+25
* Merge "Fix failed tests when the tmp directory is a symlink"Matthias Sohn2013-10-192-16/+19
|\
| * Fix failed tests when the tmp directory is a symlinkRobin Rosenberg2013-10-202-16/+19
* | Describe HEAD if no explicit target was setMatthias Sohn2013-10-111-6/+12
|/
* Prepare 3.2.0-SNAPSHOT buildsMatthias Sohn2013-10-032-37/+37
* Merge branch 'stable-3.1'Matthias Sohn2013-10-033-47/+78
|\
| * Prepare post 3.1.0 buildsstable-3.1Matthias Sohn2013-10-032-37/+37
| * JGit v3.1.0.201310021548-rv3.1.0.201310021548-rMatthias Sohn2013-10-022-2/+2
| * Prepare post 3.1.0 RC1 buildsMatthias Sohn2013-09-272-2/+2