diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2018-02-12 15:44:04 +0100 |
|---|---|---|
| committer | Christian Halstrick <christian.halstrick@sap.com> | 2019-01-08 10:01:09 +0100 |
| commit | e406d500de01b9ae7155e296baebf3ec8024869d (patch) | |
| tree | 3873d4a07a3c46d662d7ed5d66cd234c2f07188c /org.eclipse.jgit.ant/src/org/eclipse | |
| parent | 6c8240a75126013b7f4588d78e66baa54e89cbfc (diff) | |
| download | jgit-e406d500de01b9ae7155e296baebf3ec8024869d.tar.gz jgit-e406d500de01b9ae7155e296baebf3ec8024869d.zip | |
Fix "jgit checkout -f" to overwrite dirty worktree files
CheckoutCommand had a setForce() method. But this didn't correspond
to native git's 'git checkout -f' option. Deprecate the old setForce()
method and move its implementation to a new method setForceRefUpdate()
and use it to implement the -B option in the CLI class Checkout.
Add a setForced() method and use it to fix the associated '-f' option of
the CLI Checkout class to behave like native git's 'git checkout -f'
which overwrites dirty worktree files during checkout.
This is still not fully matching native git's behavior: updating
additionally dirty index entries is not done yet.
Bug: 530771
Change-Id: I776b78eb623b6ea0aca42f681788f2e4b1667f15
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.ant/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCheckoutTask.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCheckoutTask.java b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCheckoutTask.java index 0b27cc2645..5f80d00ebb 100644 --- a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCheckoutTask.java +++ b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCheckoutTask.java @@ -123,7 +123,7 @@ public class GitCheckoutTask extends Task { } try { - checkout.setCreateBranch(createBranch).setForce(force) + checkout.setCreateBranch(createBranch).setForceRefUpdate(force) .setName(branch); checkout.call(); } catch (Exception e) { |