From 87c12886fa48f80fec788d1ab57f29695220762c Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 8 Jul 2017 17:53:08 +0200 Subject: [PATCH] Fixed issue #3017: Spaces at the beginning of the URL breaks pushes Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/PullFetchDlg.cpp | 2 +- src/Utils/MiscUI/HistoryCombo.cpp | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index d392a7c47..374947a80 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -57,6 +57,7 @@ Released: unreleased * Fixed issue #3014: MergeDlg: Commit dialog is opened instead of resovle dialog after resolve button pressed * Fixed issue #2926: Don't report an error for invalid remote symbolic references * Fixed issue #2955: LogDlg: infinite line to parent when initial commit is branched + * Fixed issue #3017: Spaces at the beginning of the URL breaks pushes = Release 2.4.0 = Released: 2017-01-31 diff --git a/src/TortoiseProc/PullFetchDlg.cpp b/src/TortoiseProc/PullFetchDlg.cpp index 854b0f01b..0b10ff73c 100644 --- a/src/TortoiseProc/PullFetchDlg.cpp +++ b/src/TortoiseProc/PullFetchDlg.cpp @@ -399,7 +399,7 @@ void CPullFetchDlg::OnBnClickedOk() } if( GetCheckedRadioButton(IDC_REMOTE_RD,IDC_OTHER_RD) == IDC_OTHER_RD) { - m_Other.GetWindowTextW(m_RemoteURL); + m_RemoteURL = m_Other.GetString(); m_RemoteBranchName=m_RemoteBranch.GetString(); // only store URL in history if it's value was used diff --git a/src/Utils/MiscUI/HistoryCombo.cpp b/src/Utils/MiscUI/HistoryCombo.cpp index bc31a2111..91659888c 100644 --- a/src/Utils/MiscUI/HistoryCombo.cpp +++ b/src/Utils/MiscUI/HistoryCombo.cpp @@ -1,7 +1,7 @@ // TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2003-2012 - TortoiseSVN -// Copyright (C) 2013-2016 - TortoiseGit +// Copyright (C) 2013-2017 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -420,6 +420,8 @@ CString CHistoryCombo::GetString() const if (sel == CB_ERR ||(m_bURLHistory)||(m_bPathHistory) || (!(style&CBS_SIMPLE))) { GetWindowText(str); + if (m_bTrim) + str.Trim(); return str; } -- 2.11.4.GIT