diff options
Diffstat (limited to 'all-update.sh')
| -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 |