From 5630352f36a2aed9fc26737bdbde27c8d370e491 Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Thu, 4 Sep 2014 17:29:54 +0400 Subject: [PATCH] Adding arm-linux-perf notes ref to tools/pull.sh and tools/log.sh. --- tools/log.sh | 2 +- tools/pull.sh | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tools/log.sh b/tools/log.sh index 079eaa5ac..020542308 100755 --- a/tools/log.sh +++ b/tools/log.sh @@ -14,5 +14,5 @@ #!/bin/bash -git log --show-notes=perf --show-notes=mem --show-notes=test_build_env +git log --show-notes=perf --show-notes=arm-linux-perf --show-notes=mem --show-notes=test_build_env exit 0 diff --git a/tools/pull.sh b/tools/pull.sh index d3e50e126..c7d04b56a 100755 --- a/tools/pull.sh +++ b/tools/pull.sh @@ -14,14 +14,6 @@ #!/bin/bash -trap ctrl_c INT - -function ctrl_c() { - git checkout master >&/dev/null - - exit 1 -} - git pull --rebase status_code=$? @@ -32,10 +24,12 @@ then 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 fetch origin refs/notes/*:refs/notes/* +status_code=$? -git checkout master >&/dev/null +if [ $status_code -ne 0 ] +then + echo "Pulling notes failed" + + exit 1 +fi