Community
Participate
Working Groups
We will need a branch deletion dialog to enable setting the options (see [1]): -d : Delete a branch. The branch must be fully merged in its upstream branch, or in HEAD if no upstream was set with --track or --set-upstream. -D : Delete a branch irrespective of its merged status. This is implemented with bug 311354 -r : delete (if used with -d) the remote-tracking branches. [1] http://www.kernel.org/pub/software/scm/git/docs/git-branch.html
(In reply to comment #0) > We will need a branch deletion dialog to enable setting the options (see [1]): > -d : Delete a branch. The branch must be fully merged in its upstream branch, > or in HEAD if no upstream was set with --track or --set-upstream. > -D : Delete a branch irrespective of its merged status. This is implemented > with bug 311354 > -r : delete (if used with -d) the remote-tracking branches. > > [1] http://www.kernel.org/pub/software/scm/git/docs/git-branch.html Is there any way to avoid the dialog for the standard case? I think we should only bring a dialog if necessary, so how about this: if there are no remote-tracking branches for the branch to delete, we try to delete with -d. If this fails, a popup appears saying that deletion of this branch may incur data loss and if they want to delete anyway. If they confirm, we delete with -D. If there are in fact tracking branches, we will bring a dialog with a checkbox (?) asking if these tracking branches are to be deleted, too. Then we try to delete with -d (and -r depending on the user's choice). If this fails, we bring above confirm dialog and delete with -D if the user confirms.
Code review at http://egit.eclipse.org/r/#change,1769
Merged ast 989bfc4c0f426ce9dfbf7a42cdadeb69616c8c21
