From 8b84d390c56b1d89df18de4db7bcc0c8ada4ddcd Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Fri, 4 Sep 2009 23:50:35 +0800
Subject: [PATCH] Show nothing rebase when local branch equal upstream at
 rebasedlg

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Resources/TortoiseProcENG.rc | Bin 449826 -> 449958 bytes
 src/TortoiseProc/RebaseDlg.cpp   |  12 ++++++++++++
 src/TortoiseProc/resource.h      | Bin 166922 -> 167014 bytes
 3 files changed, 12 insertions(+)

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 9009cf430a3104f123d80834fa93c8f3ce074809..4bce52a98c74122d5ff7f9edca991b78cf89c522 100644
GIT binary patch
delta 132
zcmZ3qOM2OE>4p}@7N!>F7M2#)Eo_@MPp@0gA~5~ICN{oESB5}_PzFZ^ABK1aHwIsZ
z5C#P(RATUB$Y&^F$Y981$YV$cismt-0$~b}RRpAy7!nzZfpiRz7Xy@21@aVt{6dCO
TpiItm$4oZq?FTlqC20Zx^H?9Q

delta 37
tcmZ3sTYAwh>4p}@7N!>F7M2#)Eo_@MPxs4Y<D35ODx1{yxGiiRngAGn4pIOB

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index 6bc54c0..51b15de 100644
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -435,6 +435,18 @@ void CRebaseDlg::FetchLogList()
 
 	hash=g_Git.GetHash(m_BranchCtrl.GetString());
 
+	if(hash == g_Git.GetHash(this->m_UpstreamCtrl.GetString()))
+	{
+		m_CommitList.Clear();
+		CString text,fmt;
+		fmt.LoadString(IDS_REBASE_EQUAL_FMT);
+		text.Format(fmt,m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString());
+
+		m_CommitList.ShowText(text);
+		this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(false);
+		return;
+	}
+
 	hash=hash.Left(40);
 	
 	if(hash == base )
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index dd3d3954d46a0c42bf8049780bd22eb98f86c70c..7f209b6600ffd498058041bb353f284643a7c572 100644
GIT binary patch
delta 62
zcmeC0!S!qgS3?Wq7N(k-=?XPWLj0}_fefJxjto8w@eFPZzLOJGq?s)l%qAxulAV5_
SiHT$Sx<)3c?el7wa`*vFdlIt%

delta 24
gcmaDhgR5%>S3?Wq7N(k-=?P6tBHQ28Fjesb0Dt}op#T5?

-- 
2.11.0