Make sure we do not show an empty error message if cleanup fails.

Signed-off-by: Sven Strickroth <[email protected]>
devMichaelJones · Oct 14, 2015 · b9b2ca8 · b9b2ca8
1 parent 7491750
commit b9b2ca8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot
@@ -10692,6 +10692,11 @@ msgstr ""
 msgid "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\nDo you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?"
 msgstr ""
 
+#. Resource IDs: (IDS_GITEXEERROR_NOMESSAGE)
+#, c-format
+msgid "\"%s\" exited with an error, however, without generating any output such as an error message."
+msgstr ""
+
 #. Resource IDs: (IDS_PROC_REFINVALID)
 #, c-format
 msgid "\"%s\" is invalid."

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
@@ -3750,6 +3750,8 @@ BEGIN
     IDS_PROC_GITCONFIG_NOMSYSGIT 
                             "Git directory not set (see ""General"" settings page)."
     IDS_PROC_CLONE_DIR      "&Browse..."
+    IDS_GITEXEERROR_NOMESSAGE 
+                            """%s"" exited with an error, however, without generating any output such as an error message."
     IDS_PROC_CLONE_URLDIREMPTY "URL and directory must not be empty."
     IDS_PROC_COMMIT_SHOWPATCH "View Patch>>"
     IDS_PROC_COMMIT_HIDEPATCH "Hide Patch<<"

diff --git a/src/TortoiseProc/Commands/CleanupCommand.cpp b/src/TortoiseProc/Commands/CleanupCommand.cpp
@@ -124,6 +124,8 @@ static bool GetFilesToCleanUp(CTGitPathList& delList, const CString& baseCmd, CG
 	CString cmdout, cmdouterr;
 	if (pGit->Run(cmd, &cmdout, &cmdouterr, CP_UTF8))
 	{
+		if (cmdouterr.IsEmpty())
+			cmdouterr.Format(IDS_GITEXEERROR_NOMESSAGE, (LPCTSTR)cmdout);
 		MessageBox(nullptr, cmdouterr, _T("TortoiseGit"), MB_ICONERROR);
 		return false;
 	}

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
@@ -405,6 +405,7 @@
 #define IDC_STATBUTTON                  1132
 #define IDC_PATCH_TO_CLIPBOARD          1132
 #define IDC_LOG                         1132
+#define IDS_GITEXEERROR_NOMESSAGE       1132
 #define IDC_GRAPHCOMBO                  1133
 #define IDS_PROC_CLONE_URLDIREMPTY      1133
 #define IDC_GRAPHTYPELABEL              1134