diff options
| author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2013-08-24 06:48:31 +0000 |
|---|---|---|
| committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2013-08-24 06:48:31 +0000 |
| commit | 377e017ea2d3fb0a39475a1bfe925b3e1384cfb0 (patch) | |
| tree | 43c51a19003cabd0b9683d2425f5854cc46815fc | |
| parent | 6c02b900eb5e85447248c8054b1e9197d6af7583 (diff) | |
| download | morphs-377e017ea2d3fb0a39475a1bfe925b3e1384cfb0.tar.gz | |
fix branch identification
| -rwxr-xr-x | all-update.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/all-update.sh b/all-update.sh index fce6de9..72436b9 100755 --- a/all-update.sh +++ b/all-update.sh @@ -32,7 +32,7 @@ fi workspace="$PWD"/../.. system="$1" strata=`grep "morph.*: *" "$system.morph" | cut -d: -f2-` -branch=`git branch` +branch=`git rev-parse --abbrev-ref HEAD` if [ -z "$2" ]; then for stratum in $strata; do @@ -52,9 +52,9 @@ repos=`for stratum in $strata; do for repo in $repos; do cd $workspace/*:$repo - startpoint=`git rev-parse HEAD` echo merging master into $repo git checkout origin/master + startpoint=`git rev-parse HEAD` git merge $branch if [ $? != "0" ]; then git reset --hard $startpoint |