gituptodate: Remove john-sg branch

It is now incorporated into master.
Let the sun shine also

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>

Makefile

@@ -56,8 +56,15 @@ osd_checkpatch:
 
 # ==== Remote compelation ================================================
 # make R=remote_machine R_PATH=source_path_on_remote remote
-R ?= "perf-x4"
-R_PATH ?= "/fs/home/bharrosh/osc-osd"
+#
+# If you need this to work on panasas machines and inside kdevelop
+# /.automount/nfs.paneast.panasas.com/root/home/bharrosh/osc-osd/
+# should link on local machine to same files (.i.e $R_PATH
+# should point localy and remotely to the same files and $R_PATH better
+# be the real remote path and not through some soft link. Sigh)
+#
+R ?= "compute-6-21"
+R_PATH ?= "/.automount/nfs.paneast.panasas.com/root/home/bharrosh/osc-osd/"
 
 .PHONY: remote remote_clean
 remote:
@@ -68,15 +75,18 @@ remote:
 		git push -f ssh://$(R)/$(R_PATH)/tgt ; \
 	cd ..;
 	scp diff_upload.patch tgt_diff_upload.patch $(R):$(R_PATH)/
-	ssh $(R) "cd $(R_PATH); git reset --hard HEAD; git apply diff_upload.patch; gmake at_remote;"
+	ssh $(R) "cd $(R_PATH); gmake z__at_remote;"
 
-at_remote:
-	git apply diff_upload.patch;
+z__at_remote:
+	git reset --hard HEAD; \
+	apply_no_error(){ git apply diff_upload.patch; return 0; }; \
+	apply_no_error; \
 	cd tgt; \
 		git reset --hard HEAD; \
-		git apply ../tgt_diff_upload.patch; \
+		tgt_apply_no_error(){ git apply ../tgt_diff_upload.patch; return 0; }; \
+		tgt_apply_no_error; \
 	cd ..;
 	gmake MK_PATH=$(R_PATH) -C $(R_PATH)
 
 remote_clean:
-	ssh $(R) "cd $(R_PATH);gmake MK_PATH=$(R_PATH) -C $(R_PATH) clean"
+	ssh $(R) "cd $(R_PATH);gmake -C $(R_PATH) clean"

gituptodate

@@ -1,12 +1,28 @@
 #!/bin/bash
 #
 
+#del all tags
+git tag -d `git tag -l` 	>/dev/null 2>&1
+# update
+git remote update		>/dev/null 2>&1
+git remote prune origin
+
+git checkout  origin/master	>/dev/null 2>&1
+git submodule update
+
+git branch -f osc               origin/osc
+git branch -f master            origin/master
+git checkout  master
+echo ===========================================================================
+git branch -a -v
+echo ===========================================================================
+
 cd tgt
 
 #del all tags
-git tag -d `git tag -l`
+git tag -d `git tag -l` 	>/dev/null 2>&1
 #Update
-git remote update
+git remote update		>/dev/null 2>&1
 git remote prune origin
 
 git branch -f osd-old           origin/osd-old
@@ -18,20 +34,3 @@ git branch -a -v
 echo ===========================================================================
 
 cd ..
-
-#del all tags
-git tag -d `git tag -l`
-# update
-git remote update
-git remote prune origin
-
-# *(no branch)
-git checkout origin/master
-git submodule update
-
-git branch -f osc               origin/osc
-git branch -f master            origin/master
-git branch -f john-sg           origin/john-sg
-echo ===========================================================================
-git branch -a -v
-echo ===========================================================================