mirrors/jgit - jgit - source @ dussan.org

Tree: bf69401fee

Author	SHA1	Message	Date
Mathias Kinzler	14ca80bc90	Make PullCommand work with Rebase Rebase must honor the upstream configuration branch.<branchname>.rebase Change-Id: Ic94f263d3f47b630ad75bd5412cb4741bb1109ca Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>	13 years ago
Shawn O. Pearce	013cb8de38	Reduce calls to Repository.getConfig Each time getConfig() is called on FileRepository, it checks the last modified time of both ~/.gitconfig and $GIT_DIR?config. If $GIT_DIR/config appears to have been modified, it is read back in from disk and the current config is wiped out. When mutating a configuration file, this may cause in-memory edits to disappear. To avoid that callers need to avoid calling getConfig until after the configuration has been saved to disk. Unfortunately the API is still horribly broken. Configuration should be modified only while a lock is held on the configuration file, very similar to the way a ref is updated via its locking protocol. But our existing API is really broken for that so we'll have to defer cleaning up the edit path for a future change. Change-Id: I5888dd97bac20ddf60456c81ffc1eb8df04ef410 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>	13 years ago
Robin Stocker	d36c80fd04	Remove unnecessary null check The field monitor is never null, it's a NullProgressMonitor when not explicitly set. Change-Id: I8ce703a32c28ce5c3455efeb7ed5f5c9a443cbef	13 years ago
Mathias Kinzler	7668a46282	PullCommand: support upstream configuration for local branches When creating a local branch based on another local branch, the upstream configuration contains "." as origin and the source branch as "merge". The PullCommand should support this by skipping the fetch step altogether and use the base branch to merge with. Change-Id: I260a1771aeeffca5b0161d1494fd63c672ecc2a6 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>	13 years ago
Mathias Kinzler	db55d13f5f	Add "Pull" command This is the minimal implementation of a "Pull" command. It does not have any parameters besides the generic progress monitor and timeout. It works on the currently checked-out branch and assumes that the configuration contains the keys "branch.<branch name>.remote" and "branch.<branch name>.merge" to determine the remote configuration for the fetch and the remote branch name for the merge. Bug: 303404 Change-Id: I7fe09029996d0cfc09a7d8f097b5d6af1488fa93 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>	13 years ago

5 Commits (bf69401feeea459d10b0cfc9cbe9bdb5d8f38bf0)