./tools/pull.sh: pulling notes with git pull --rebase. tools/push.sh: make pull just before pushing; pushing master and notes with one command.

2014-08-21 18:21:25 +04:00
parent 2851c59d97
commit bb55d895c4
2 changed files with 34 additions and 13 deletions
@@ -14,5 +14,28 @@

 #!/bin/bash

+trap ctrl_c INT
+
+function ctrl_c() {
+    git checkout master >&/dev/null
+
+    exit 1
+}
+
 git pull --rebase
-git fetch origin refs/notes/*:refs/notes/*
+status_code=$?
+
+if [ $status_code -ne 0 ]
+then
+  echo "Pulling master failed"
+
+  exit 1
+fi
+
+for notes_ref in perf mem test_build_env
+do
+  git checkout refs/notes/$notes_ref
+  git pull --rebase origin refs/notes/$notes_ref
+done
+
+git checkout master >&/dev/null