diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-10-07 03:25:55 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-10-07 03:39:02 +0200 |
| commit | 56e5e19a84133c07f4f909342b292eb2b3b6c0aa (patch) | |
| tree | 5b51152ca2d75c5e6b74ebdabdfe222f09099b54 /scripts | |
| parent | 8a63be280e7c06dba8c853461e3daf50c49db8d3 (diff) | |
| download | tde-56e5e19a84133c07f4f909342b292eb2b3b6c0aa.tar.gz tde-56e5e19a84133c07f4f909342b292eb2b3b6c0aa.zip | |
Scripts: Fix branch detection with git older than 1.7.10
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/commit_all_submodules | 2 | ||||
| -rwxr-xr-x | scripts/switch_all_submodules_to_head_and_clean | 2 | ||||
| -rwxr-xr-x | scripts/update_all_submodules | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/commit_all_submodules b/scripts/commit_all_submodules index ce3a8c7ab..c754640e7 100755 --- a/scripts/commit_all_submodules +++ b/scripts/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/scripts/switch_all_submodules_to_head_and_clean b/scripts/switch_all_submodules_to_head_and_clean index c35d9f817..017153719 100755 --- a/scripts/switch_all_submodules_to_head_and_clean +++ b/scripts/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/scripts/update_all_submodules b/scripts/update_all_submodules index 46fcc6d2e..8e6668f8a 100755 --- a/scripts/update_all_submodules +++ b/scripts/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..." |