From 93a7d2cce9a441174cc8e2cf495664db2256d2cb Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Tue, 28 Aug 2012 08:44:40 +0200 Subject: [PATCH] SyncDlg: Make check if local branch fast-fowards to remote branch work again Issue introduced in revision 907ac6f5510d7e30af4dd79450f4a8d06250c182. Signed-off-by: Sven Strickroth --- src/TortoiseProc/SyncDlg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp index 4f0fa68a4..894f1ee34 100644 --- a/src/TortoiseProc/SyncDlg.cpp +++ b/src/TortoiseProc/SyncDlg.cpp @@ -961,7 +961,7 @@ void CSyncDlg::FetchOutList(bool force) CString cmd, basestr, err; cmd.Format(_T("git.exe merge-base %s %s"), g_Git.FixBranchName(remotebranch), g_Git.FixBranchName(localbranch)); g_Git.Run(cmd, &basestr, &err, CP_UTF8); - base = basestr; + base = basestr.Trim(); remotehash = g_Git.GetHash(remotebranch); if (remotehash == g_Git.GetHash(localbranch)) -- 2.11.4.GIT