Merge pull request #70 from Cyberboss/lessannoyance

Adds reset message, removes already up to date message, fixes reset logging

TGServerService/Repository.cs

@@ -336,7 +336,6 @@ string MergeBranch(string branchname)
 					SendMessage("REPO: Merge conflicted, aborted.");
 					return "Merge conflict occurred.";
 				case MergeStatus.UpToDate:
-					SendMessage("REPO: Merge already up to date!");
 					return RepoErrorUpToDate;
 			}
 			return null;
@@ -455,10 +454,13 @@ public string Reset(bool trackedBranch)
 			lock (RepoLock)
 			{
 				var res = LoadRepo() ?? ResetNoLock(trackedBranch ? (Repo.Head.TrackedBranch ?? Repo.Head) : Repo.Head);
-				if (trackedBranch && res == null)
+				if (res == null)
 				{
-					DeletePRList();
+					SendMessage(String.Format("REPO: Hard reset to {0}branch", trackedBranch ? "tracked " : ""));
+					if (trackedBranch)
+						DeletePRList();
 					TGServerService.WriteInfo(String.Format("Repo branch reset{0}", trackedBranch ? " to tracked branch" : ""), trackedBranch ? TGServerService.EventID.RepoResetTracked : TGServerService.EventID.RepoReset);
+					return null;
 				}
 				TGServerService.WriteWarning(String.Format("Failed to reset{0}: {1}", trackedBranch ? " to tracked branch" : "", res), trackedBranch ? TGServerService.EventID.RepoResetTrackedFail : TGServerService.EventID.RepoResetFail);
 				return res;