From 4816dfe85261c07f53930c37957b965586e06b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 7 Oct 2012 03:25:55 +0200
Subject: [PATCH] Scripts: Fix branch detection with git older than 1.7.10

---
 commit_all_submodules                   | 2 +-
 switch_all_submodules_to_head_and_clean | 2 +-
 update_all_submodules                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/commit_all_submodules b/commit_all_submodules
index ce3a8c7..c754640 100755
--- a/commit_all_submodules
+++ b/commit_all_submodules
@@ -6,7 +6,7 @@ if [[ ! -e .git ]] ||
 	exit 1
 fi
 
-branch=`git symbolic-ref --short -q HEAD`
+branch=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
 if [[ -z "$branch" ]] ||
    [[ -z "`git rev-parse --symbolic-full-name --remotes=\"*/$branch\"`" ]]; then
 	echo "There is not active upstream branch.  Exiting..."
diff --git a/switch_all_submodules_to_head_and_clean b/switch_all_submodules_to_head_and_clean
index c35d9f8..0171537 100755
--- a/switch_all_submodules_to_head_and_clean
+++ b/switch_all_submodules_to_head_and_clean
@@ -6,7 +6,7 @@ if [[ ! -e .git ]] ||
 	exit 1
 fi
 
-branch=`git symbolic-ref --short -q HEAD`
+branch=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
 if [[ -z "$branch" ]] ||
    [[ -z "`git rev-parse --symbolic-full-name --remotes=\"*/$branch\"`" ]]; then
 	echo "There is not active upstream branch.  Exiting..."
diff --git a/update_all_submodules b/update_all_submodules
index 46fcc6d..8e6668f 100755
--- a/update_all_submodules
+++ b/update_all_submodules
@@ -12,7 +12,7 @@ if [[ ! -e .git ]] ||
 	exit 1
 fi
 
-branch=`git symbolic-ref --short -q HEAD`
+branch=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
 if [[ -z "$branch" ]] ||
    [[ -z "`git rev-parse --symbolic-full-name --remotes=\"*/$branch\"`" ]]; then
 	echo "There is not active upstream branch.  Exiting..."