From 5bd211b5454abeb8a75163f76fe15c2c6911cc27 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Tue, 27 Dec 2011 03:04:09 +0100 Subject: [PATCH] do not allow to start rebase after fetch on bare repo Signed-off-by: Sven Strickroth --- src/TortoiseProc/PullFetchDlg.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/TortoiseProc/PullFetchDlg.cpp b/src/TortoiseProc/PullFetchDlg.cpp index 51080f2ca..3a904602a 100644 --- a/src/TortoiseProc/PullFetchDlg.cpp +++ b/src/TortoiseProc/PullFetchDlg.cpp @@ -147,6 +147,9 @@ BOOL CPullFetchDlg::OnInitDialog() this->GetDlgItem(IDC_CHECK_NOCOMMIT)->EnableWindow(FALSE); } + if (g_GitAdminDir.IsBareRepo(g_Git.m_CurrentDir)) + this->GetDlgItem(IDC_CHECK_REBASE)->EnableWindow(FALSE); + m_Other.SetURLHistory(TRUE); m_Other.LoadHistory(_T("Software\\TortoiseGit\\History\\PullURLS"), _T("url")); CString clippath=CAppUtils::GetClipboardLink(); -- 2.11.4.GIT