| commit | 3dcdfdf015746c7ec10d915705c1a76cc9d9de31 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 21 Jan 2007 09:54:01 +0000 (21 04:54 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 21 Jan 2007 09:54:01 +0000 (21 04:54 -0500) | ||
| tree | a4520c2592d76ea2f275d35db025e99c9f1fa77f | treesnapshot (tar.gz zip) |
| parent | 4f9d8519fb3297063392d0268c0430fe5a6a02f1 | commitdiff |
git-gui: Don't delete the test target branch.
Its possible for the user to select a branch for the merge test
(while deleting branches) and also select that branch for deletion.
Doing so would have bypassed our merge check for that branch, as
a branch is always a strict subset of itself. So we will simply
skip over a branch and not delete it if that is the branch which
the user selected for the merge check.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Its possible for the user to select a branch for the merge test
(while deleting branches) and also select that branch for deletion.
Doing so would have bypassed our merge check for that branch, as
a branch is always a strict subset of itself. So we will simply
skip over a branch and not delete it if that is the branch which
the user selected for the merge check.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-gui.sh | diffblobblamehistory |