summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
Commit message (Expand)AuthorAgeFilesLines
* Refactor ResolveMergerTest to allow testing multiple strategiesChristian Halstrick2012-10-251-35/+67
* StashCreateCommand: Abort in case of unmerged pathsRobin Stocker2012-10-222-0/+46
* CommitCommand: Use original author on amend if author is not setRobin Stocker2012-10-081-0/+44
* CommitCommand: Don't allow amending on initial commitRobin Stocker2012-10-081-0/+7
* Fix unstable testRobin Rosenberg2012-10-021-1/+1
* Remove unused import introduced with 8f706db5Matthias Sohn2012-09-251-2/+2
* Merge "Provide a convenient read() in RepositoryTestCase"Christian Halstrick2012-09-251-0/+4
|\
| * Provide a convenient read() in RepositoryTestCaseRobin Stocker2012-09-251-0/+4
* | Merge "Add the intended file to avoid breakage"Christian Halstrick2012-09-251-1/+1
|\ \ | |/ |/|
| * Add the intended file to avoid breakageRobin Rosenberg2012-09-251-1/+1
* | Merge "Allow @ in branch names and tighten syntax checking"Robin Rosenberg2012-09-241-0/+53
|\ \
| * | Allow @ in branch names and tighten syntax checkingRobin Rosenberg2012-09-231-0/+53
| |/
* | Merge "FileBasedConfig supports UTF-8 byte order marker"Robin Rosenberg2012-09-241-0/+162
|\ \
| * | FileBasedConfig supports UTF-8 byte order markerMarc Strapetz2012-09-241-0/+162
* | | Merge "Refuse to checkout unmerged paths from index"Christian Halstrick2012-09-241-0/+21
|\ \ \
| * | | Refuse to checkout unmerged paths from indexRobin Stocker2012-09-231-0/+21
| | |/ | |/|
* / | Comment an empty block which is okRobin Rosenberg2012-09-231-0/+1
|/ /
* | Suppress boxing warnings where we know they are okRobin Rosenberg2012-09-2212-21/+37
* | Fixed instability in some GC tests.Sasa Zivkov2012-09-201-11/+7
|/
* Prepare 2.2.0 buildsMatthias Sohn2012-09-192-33/+33
* Merge branch 'stable-2.1'Matthias Sohn2012-09-192-24/+111
|\
| * Prepare for 2.1 maintenance changesstable-2.1Matthias Sohn2012-09-192-2/+2
| * JGit v2.1.0.201209190230-rv2.1.0.201209190230-rMatthias Sohn2012-09-192-2/+2
| * Introduce "never" as parseable dateRobin Rosenberg2012-09-181-0/+11
| * Introduce ParseExceptions for GitDateParserChristian Halstrick2012-09-172-24/+100
* | Merge "Fix resolving expression with ~ and ^ than extends beyond history"Robin Rosenberg2012-09-182-1/+386
|\ \
| * | Fix resolving expression with ~ and ^ than extends beyond historyDave Borowitz2012-09-181-0/+23
| |/
| * Additional unit tests for the GCSasa Zivkov2012-09-161-1/+363
* | Use assertEquals instead of == for literal primitivesRobin Rosenberg2012-09-167-14/+13
* | Use assertTrue/False instead of equals with boolean literalsRobin Rosenberg2012-09-164-62/+67
|/
* cleanup: use assertArrayEquals for assertion on arraysRobin Rosenberg2012-09-0310-45/+43
* cleanup: Prefer assertEquals over assertTrue(....equals(...))Robin Rosenberg2012-09-0313-44/+43
* Merge "Support branches with name 'config'"Christian Halstrick2012-09-031-0/+13
|\
| * Support branches with name 'config'Christian Halstrick2012-08-211-0/+13
* | Merge "Add tests for more coverage of CheckoutCommand"Matthias Sohn2012-09-031-0/+65
|\ \
| * | Add tests for more coverage of CheckoutCommandRobin Stocker2012-09-031-0/+65
* | | DirCacheCheckout: Fix handling of files not in indexRobin Stocker2012-09-012-9/+38
|/ /
* | Create an input stream that transforms LF to CRLFRobin Rosenberg2012-09-011-0/+122
* | Implement a parser for datesChristian Halstrick2012-08-281-0/+228
* | Merge changes I98df46ce,Ifb815a12,I051a1724Robin Rosenberg2012-08-212-5/+91
|\ \
| * | Support [<ref>]@{upstream} revision syntaxRobin Rosenberg2012-07-201-0/+23
| * | Support parsing previous checkout as a revision expresion.Robin Rosenberg2012-07-202-5/+36
| * | Allow a @ without branch in revision syntaxRobin Rosenberg2012-07-161-0/+32
* | | Merge changes I4f73487b,I1d1ed122Matthias Sohn2012-08-212-1/+3
|\ \ \ | |_|/ |/| |
| * | The Git API's only likes /, not \ in pathsRobin Rosenberg2012-08-211-1/+1
| * | Skip a test that cannot be verified on WindowsRobin Rosenberg2012-08-211-0/+2
* | | Teach BranchTrackingStatus to handle tracking of local branchesMatthias Sohn2012-08-181-0/+40
* | | Improve ours/theirs conflict markers for rebase, cherry-pickRobin Stocker2012-08-183-5/+44
|/ /
* | Fix idOffset when the working tree iterator matches a dircache entryRobin Rosenberg2012-08-151-0/+25
* | Merge "Allow JGit to read C Git rebase state"Christian Halstrick2012-08-131-2/+2
|\ \