mirrors/jgit - jgit - source @ dussan.org

Tree: 162a5c4c89

Author	SHA1	Message	Date
Stefan Lay	591998c2d6	Do not allow non-ff-rebase if there are uncommitted changes With this change jgit checks for uncommitted changes before a rebase is started. This is also done by native git. One reason is that an abort would override such changes. The check is skipped for a non-interactive rebase when it will result in a fast-forward. In this case there can be only checkout conflicts but no merge conflicts, so there cannot be an abort which overrides uncommitted changes. Bug: 422352 Change-Id: I1e0b59b2a4d80a686b67a6729e441924362b1236 Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	10 years ago
Robin Stocker	a50ed5666f	status: Print conflict description for unmerged paths Prefix unmerged paths with conflict description (e.g. "both modified:"), the same way C Git does. Change-Id: I083cd191ae2ad3e2460aa4052774aed6e36c2699	11 years ago
Markus Duft	f64237d5ff	Adapt Status and CleanCommand to support cleaning directories This adds the possibility to: * retrieve untracked directories from the status * instruct the CleanCommand to clean those directories. * retrieve ignored paths from the status * instruct the CleanCommand to leave those ignored paths alone Bug: 338717 Change-Id: Ibed0459005a5e306c010b9932f5b5fd107fb5448 Signed-off-by: Chris Aniszczyk <zx@twitter.com>	12 years ago
Kevin Sawicki	3d15298011	Add helper for determining if status is clean This checks if all collections that Status exposes are empty or not Change-Id: I0c342ab70dc36c1fd70acb4f8a924bb207d62f47	12 years ago
Piotr Janik	2e43e1e904	Add getConflicting() method in Status API Bug: 345899 Change-Id: I133b9dd3e9a9c3c749547a884df3ce371929f38e Signed-off-by: Piotr Janik <janikpiotrek@gmail.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>	13 years ago
Christian Halstrick	c160293d71	Add status command to GIT api Allow users of the GIT api to get to know the state of their workingtree and index by adding a status command. The implementation is mainly a wrapper around IndexDiff class. Better support for multiple stages in the index (conflict situations) is still missing. An appropriate change to IndexDiff and StatusCommand will come in a subsequent commit. Bug: 337296 Change-Id: Idb390375a68611853c1c903299ec678c89b081dc Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>	13 years ago

6 Commits (162a5c4c89b289af3755a2f26843cdf908e93c50)