From b36cca122a5cc1ed0d7acd1a084a51242f533f3a Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Fri, 18 Apr 2014 11:52:12 +0200
Subject: [PATCH] Force parameter is never used

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseProc/BrowseRefsDlg.cpp | 14 ++++++--------
 src/TortoiseProc/BrowseRefsDlg.h   |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/TortoiseProc/BrowseRefsDlg.cpp b/src/TortoiseProc/BrowseRefsDlg.cpp
index 23311bf39..2fda6a33e 100644
--- a/src/TortoiseProc/BrowseRefsDlg.cpp
+++ b/src/TortoiseProc/BrowseRefsDlg.cpp
@@ -751,15 +751,15 @@ bool CBrowseRefsDlg::ConfirmDeleteRef(VectorPShadowTree& leafs)
 
 }
 
-bool CBrowseRefsDlg::DoDeleteRefs(VectorPShadowTree& leafs, bool bForce)
+bool CBrowseRefsDlg::DoDeleteRefs(VectorPShadowTree& leafs)
 {
 	for(VectorPShadowTree::iterator i = leafs.begin(); i != leafs.end(); ++i)
-		if(!DoDeleteRef((*i)->GetRefName(), bForce))
+		if(!DoDeleteRef((*i)->GetRefName()))
 			return false;
 	return true;
 }
 
-bool CBrowseRefsDlg::DoDeleteRef(CString completeRefName, bool bForce)
+bool CBrowseRefsDlg::DoDeleteRef(CString completeRefName)
 {
 	bool bIsRemoteBranch = false;
 	bool bIsBranch = false;
@@ -799,8 +799,6 @@ bool CBrowseRefsDlg::DoDeleteRef(CString completeRefName, bool bForce)
 	}
 	else if (bIsBranch)
 	{
-		if (!bForce && !g_Git.IsFastForward(completeRefName, _T("HEAD")))
-			return true;
 		if (g_Git.DeleteRef(completeRefName))
 		{
 			CMessageBox::Show(m_hWnd, g_Git.GetGitLastErr(L"Could not delete reference.", CGit::GIT_CMD_DELETETAGBRANCH), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
@@ -1102,14 +1100,14 @@ void CBrowseRefsDlg::ShowContextMenu(CPoint point, HTREEITEM hTreePos, VectorPSh
 	case eCmd_DeleteRemoteBranch:
 		{
 			if(ConfirmDeleteRef(selectedLeafs))
-				DoDeleteRefs(selectedLeafs, true);
+				DoDeleteRefs(selectedLeafs);
 			Refresh();
 		}
 		break;
 	case eCmd_DeleteTag:
 		{
 			if(ConfirmDeleteRef(selectedLeafs))
-				DoDeleteRefs(selectedLeafs, true);
+				DoDeleteRefs(selectedLeafs);
 			Refresh();
 		}
 		break;
@@ -1188,7 +1186,7 @@ void CBrowseRefsDlg::ShowContextMenu(CPoint point, HTREEITEM hTreePos, VectorPSh
 				selectedLeafs.push_back((CShadowTree*)m_ListRefLeafs.GetItemData(i));
 			}
 			if (ConfirmDeleteRef(selectedLeafs))
-				DoDeleteRefs(selectedLeafs, true);
+				DoDeleteRefs(selectedLeafs);
 			Refresh();
 		}
 		break;
diff --git a/src/TortoiseProc/BrowseRefsDlg.h b/src/TortoiseProc/BrowseRefsDlg.h
index c8aa1d5f6..6b4f1cc87 100644
--- a/src/TortoiseProc/BrowseRefsDlg.h
+++ b/src/TortoiseProc/BrowseRefsDlg.h
@@ -138,8 +138,8 @@ protected:
 	bool			SelectRef(CString refName, bool bExactMatch);
 
 	bool			ConfirmDeleteRef(VectorPShadowTree& leafs);
-	bool			DoDeleteRefs(VectorPShadowTree& leafs, bool bForce);
-	bool			DoDeleteRef(CString completeRefName, bool bForce);
+	bool			DoDeleteRefs(VectorPShadowTree& leafs);
+	bool			DoDeleteRef(CString completeRefName);
 
 	CString			GetFullRefName(CString partialRefName);
 
-- 
2.11.4.GIT