summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prepare 2.0.0-SNAPSHOT buildsMatthias Sohn2012-02-1640-245/+245
| | | | | Change-Id: I946e315af04227727ac937ebe9d70ae1ea4e8936 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-1.3'Matthias Sohn2012-02-162-9/+235
|\ | | | | | | | | | | | | | | | | | | * stable-1.3: Prepare post 1.3.0.201202151440-r build JGit 1.3.0.201202151440-r Generate conflicts and index updates on file mode changes Change-Id: Ie99780ef5cdea7b3ea1ea076282fe0a25f14f469 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 1.3.0.201202151440-r buildstable-1.3Matthias Sohn2012-02-1640-50/+50
| | | | | | | | | | Change-Id: I4d695273e3151c22f2df9a58725cc7ba21ab6043 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit 1.3.0.201202151440-rv1.3.0.201202151440-rMatthias Sohn2012-02-1540-50/+50
| | | | | | | | | | Change-Id: I663208919f297836a9c16bf458e4a43ffaca4c12 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Generate conflicts and index updates on file mode changesChristian Halstrick2012-02-132-9/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle more cases for file mode changes. Especially make sure that the following cases are handled correctly. Case 1) An entry in the working tree, HEAD tree, and merge tree have different modes and different content. Prior Outcome: Dirty working tree content is replaced and file mode changes are lost. New Outcome: Conflict is generated. Case 2) An entry in the index and merge tree have the same content but different modes but both modes are file type modes. Prior Outcome: File mode in working tree is not updated and the working directory is dirty. New Outcome: Index is updated and the working directory is clean. Bug: 363772 Change-Id: I224602d68228eb419813986807f1eeab77e9c302 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Also-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-1.3'Matthias Sohn2012-02-1310-63/+288
|\| | | | | | | | | | | | | | | | | | | | | | | * stable-1.3: Prepare post 1.3.0.201202121842-rc4 builds JGit 1.3.0.201202121842-rc4 Support gitdir references in working tree .git file Support committing submodule updates Update iplog tool's README Change-Id: Id70f4d4b059b03d4fa6fbd9137b81a337e9c48e8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 1.3.0.201202121842-rc4 buildsMatthias Sohn2012-02-1340-50/+50
| | | | | | | | | | Change-Id: I50e0e6c2bccab5f3da62cbfe976f065169426906 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit 1.3.0.201202121842-rc4v1.3.0.201202121842-rc4Matthias Sohn2012-02-1340-50/+50
| | | | | | | | | | Change-Id: I82c6c0c175ab6fb4e2113101f36c8d2ddf4a13c1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Support gitdir references in working tree .git fileKevin Sawicki2012-02-087-51/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | A '.git' file in a repository's working tree root is now parsed as a ref to a folder located elsewhere. This supports submodules having their repository location outside of the parent repository's working directory such as in the parent repository's '.git/modules' directory. This adds support to BaseRepositoryBuilder for repositories created with the '--separate-git-dir' option specified to 'git init'. Change-Id: I73c538f6d845bdbc0c4e2bce5a77f900cf36e1a9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Support committing submodule updatesKevin Sawicki2012-01-302-6/+109
| | | | | | | | | | | | | | Use the submodule object id provided by the working tree iterator Change-Id: Ibf82f56c04cb9c91b2b309cf0cfa3f638539e23c
| * Update iplog tool's READMEMatthias Sohn2012-01-271-6/+6
| | | | | | | | | | Change-Id: I0a6d770b0c4deb11fea23b875ef5449c619c05a1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add getters for old and new prefixes in DiffFormatterTomasz Zarna2012-02-021-0/+18
|/ | | | | Bug: 370318 Change-Id: Iaf9282ba55ee3bb4e2c27fb71c598b308771bf57
* Merge "Add developers section to root POM file"Matthias Sohn2012-01-261-0/+33
|\
| * Add developers section to root POM fileKevin Sawicki2012-01-251-0/+33
| | | | | | | | | | | | | | This section contains the names of the current committers and is required for acceptance to the Maven Central repository Change-Id: Ib758cfe0a574aa3e80af9d289bec1a74d9b78d25
* | Merge "Allow to list tags with org.eclipse.jgit.pgm.Tag"Robin Rosenberg2012-01-251-7/+20
|\ \
| * | Allow to list tags with org.eclipse.jgit.pgm.TagTomasz Zarna2011-12-021-7/+20
| | | | | | | | | | | | Change-Id: I79c284a720935814aef9767156106833f983bb8b
* | | Move writeTrashFile and deleteFile into JGitTestUtilDariusz Luksza2012-01-253-15/+49
| |/ |/| | | | | | | | | | | | | | | Moves RepositoryTestCase.writeThashFile, RepositoryTestCase.deleteFile and dependencies into JGitTestUtil for further reuse. Required-by-EGit: If8dfa0251797aca56ddc825619500dc21885ba26 Change-Id: I6fc62c8e6626f907e544b5bbe5d64e864a2c323f Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
* | Add scm section to root POM fileKevin Sawicki2012-01-231-0/+5
| | | | | | | | Change-Id: I23db67685a7b6a481961eb6ed6b4b80b2d0cace8
* | Really close output stream when core.autocrlf is trueRobin Rosenberg2012-01-231-1/+2
| | | | | | | | Change-Id: I8a0d91e908145168c32589600bd1598826511ae3
* | Workaround incompatible refactoring in Jetty 7.6.0Tomasz Zarna2012-01-212-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Jetty 7.6 package org.eclipse.jetty.http.security was renamed to org.eclipse.jetty.util.security [1] breaking compatibility. Compare docs for the package in 7.5.4 [2] and missing part in 7.6.0 [3]. To fix until we switch to Jetty 8, restrict the maximum version to 7.6.0 exclusive. [1] http://dev.eclipse.org/mhonarc/lists/jetty-dev/msg01175.html [2] http://download.eclipse.org/jetty/7.5.4.v20111024/apidocs/ [3] http://download.eclipse.org/jetty/7.6.0.RC4/apidocs/ Change-Id: I82b107ec76e66367e55e2cc20233a7924bf7be9f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add command support for listing stashed commitsKevin Sawicki2012-01-205-2/+268
| | | | | | | | | | | | Bug: 309355 Change-Id: I34a8c251b89abcdb67565ca49bee02e5e2113593 Signe-off-by: Chris Aniszczyk <zx@twitter.com>
* | Merge "Support relative submodule URLs on init/add/sync"Matthias Sohn2012-01-189-17/+437
|\ \
| * | Support relative submodule URLs on init/add/syncKevin Sawicki2012-01-179-17/+437
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interpret submodule URLs that start with './' or '../' as relative to either the configured remote for the HEAD branch, or 'origin', or the parent repository working directory if no remote URL is configured Bug: 368536 Change-Id: Id4985824023b75cd45cd64a4dd9d421166391e10
* | | Add BranchTrackingStatus for getting remote tracking statusRobin Stocker2012-01-162-0/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used by EGit change I1e1caca561d1b0a0c194bfc42e64b698f42c6e6a to show branch status in decoration. It can also be used for providing the same output as C Git in "git status". Change-Id: I8d2b108c89905c3f0496f3d517879596740787c0 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Add BranchConfig helper for access to branch config sectionRobin Stocker2012-01-162-0/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | Getting the name of the remote-tracking branch given a branch is not so easy to get right. This class provides a way to do that and could be used for more branch config related things (e.g. in PullCommand). Change-Id: I896a2384217936c8b672df8b81c9599f5c350458 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Add RevWalkUtils with count(start, end) methodRobin Stocker2012-01-162-0/+199
|/ / | | | | | | | | | | | | | | It returns the number of commits that are in start and not in end. Useful for calculating how much a branch is ahead of another one. Change-Id: I09f7d9b049beea417da7ff32c9f8bf0d4ed46a7f Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Support more of AutoCRLF"Christian Halstrick2012-01-1611-13/+506
|\ \
| * | Support more of AutoCRLFRobin Rosenberg2012-01-1011-13/+506
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces CRLF handling to the DirCacheCheckout and WorkingTreeIterator supporting the AutoCRLF for add, checkout reset and status and hopefully some other places that depende on the underlying logic of the affected API's. The patch includes test cases for the Status command provided by Tomasz Zarna for bug 353867. The core.eol and core.safecrlf options are not yet supported. Bug: 301775 Bug: 353867 Change-Id: I2280a2dc0698829475de6a662a6c6e80b1df7663
* | | Fix resolution of tree when path is emptyRobin Rosenberg2012-01-152-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Revision strings that end with a ':' with no trailing path should return the tree associated with the current ref parsed Bug: 368370 Change-Id: I7c7617a77bd418bad4e570be2d1e9002ad280762 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | | Make sure all bytes are written to files on close, or get an error.Robin Rosenberg2012-01-1513-30/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java's BufferedOutputStream swallows any errors that occur when flushing the buffer in close(). This class overrides close to make sure an error during the final flush is reported back to the caller. Change-Id: I74a82b31505fadf8378069c5f6554f1033c28f9b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Resolve ~ with no trailing number as the first parent commit"Robin Rosenberg2012-01-142-7/+15
|\ \ \
| * | | Resolve ~ with no trailing number as the first parent commitKevin Sawicki2012-01-142-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | This would previously throw a RevisionSyntaxException Change-Id: I42b4988c7f6c6454e2ebda13914260e25ac1a889
* | | | Throw API exception when LsRemoteCommand fails with TransportExceptionMatthias Sohn2012-01-152-2/+70
|/ / / | | | | | | | | | | | | | | | | | | In many cases applications want to handle TransportException hence expose it as an API exception. Change-Id: I64b885ecfb1a35bd93c89026c6298d1820ba69d0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* / / Cannot commit -o file with only file permission changeRobin Rosenberg2012-01-132-1/+35
|/ / | | | | | | | | | | Bug 345076 Change-Id: Ie64039793ab6ba4748731320399f03301b6282ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Provide helper for unlocking a file"Matthias Sohn2012-01-102-2/+117
|\ \
| * | Provide helper for unlocking a fileKevin Sawicki2012-01-092-2/+117
| | | | | | | | | | | | | | | | | | | | | | | | This will allow recovery from a LockFailedException where the file associated with an exception is passed to FileUtils.unlock to attempt an unlock on the file so the operation can be retried Change-Id: I580166d386126bfb54a318a65253070a6e325936
* | | Add setter for ProgressMonitor to DiffCommandTomasz Zarna2012-01-091-0/+20
| | | | | | | | | | | | Change-Id: I34f8b77a461e165d7d624dbd9a6944feadc57b8e
* | | Merge "Add options for setting context lines and prefixes to DiffCommand"Stefan Lay2012-01-092-0/+92
|\ \ \
| * | | Add options for setting context lines and prefixes to DiffCommandTomasz Zarna2012-01-092-0/+92
| |/ / | | | | | | | | | Change-Id: I539f3531e94c11c0f0a3e7096c0eb1b1c309898a
* | | Merge "Add helper for determining if status is clean"Christian Halstrick2012-01-091-1/+18
|\ \ \ | |/ / |/| |
| * | Add helper for determining if status is cleanKevin Sawicki2012-01-031-1/+18
| | | | | | | | | | | | | | | | | | | | | This checks if all collections that Status exposes are empty or not Change-Id: I0c342ab70dc36c1fd70acb4f8a924bb207d62f47
* | | Narrow exceptions declared by LsRemoteCommandMatthias Sohn2012-01-081-40/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | API commands either throw GitAPIException or JGitInternalException. Also add missing javadoc and reduce nesting of catch blocks. Change-Id: I9a3b302e1b3f373ee11a977a0e3d6213bfbd3cdf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Kevin Sawicki <kevin@github.com>
* | | Merge "Retain executable mode of existing files on Windows"Robin Rosenberg2012-01-086-4/+286
|\ \ \
| * | | Retain executable mode of existing files on WindowsKevin Sawicki2012-01-036-4/+286
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently files in a repository marked as executable will have that mode unset when modified and committed on systems that do not support detection of this mode since the working tree iterator will never report this mode for any entries. This change updates WorkingTreeIterator to be able to determine the target file mode to be used for the index through consideration of the configured WorkingTreeOptions. Bug: 364956 Change-Id: Iae496baa011b8a59d9329ec73615482b03d34a5a
* | | Merge "Use constants from ConfigConstants in CoreConfig"Matthias Sohn2012-01-052-3/+15
|\ \ \
| * | | Use constants from ConfigConstants in CoreConfigKevin Sawicki2012-01-032-3/+15
| |/ / | | | | | | | | | Change-Id: Ic1253498ecdd7545c6b1f114f4c83a3b77273874
* / / Provide file mode of paths in index from IndexDiffKevin Sawicki2012-01-041-0/+11
|/ / | | | | | | Change-Id: I1d543e2f721987114cc1e1cb0848c234470df794 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add support for cloning submodules to CloneCommandKevin Sawicki2012-01-022-0/+73
| | | | | | | | Change-Id: Ib1f82206fa14be75e2080f95db9f2d178e876453
* | Extend TransportCommand in submodule add/update commandsKevin Sawicki2012-01-022-34/+6
| | | | | | | | | | | | | | | | This allows all the settings of a TransportCommand to be configured on the clone commands that are run by submodule add/update Change-Id: I93bfe5a91d430200de8c7f1e32a60cb990aa58ea
* | Add submodule command helpers to Git classKevin Sawicki2012-01-021-0/+51
| | | | | | | | Change-Id: I649d96617072db68ab15aa2569836fa783577424
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 14:01:30 +0000