Updating git scripts

+ add support for gitfile (submodules with git >= 1.7.8)
+ add gituser detection from git configuration
+ add support for branches
+ various optimizations
pull/1/head
Slávek Banko 10 years ago
parent 5ead2a2d3b
commit 95dd4739aa
  1. 28
      commit_all_submodules
  2. 32
      switch_all_submodules_to_head_and_clean
  3. 57
      update_all_submodules

@ -1,17 +1,29 @@
#!/bin/bash
if [[ ! -d .git ]]; then
if [[ ! -e .git ]] ||
[[ -z "`git rev-parse --git-dir 2>/dev/null`" ]]; then
echo "This script can only be run from a top level git directory. Exiting..."
exit 1
fi
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..."
exit 1
fi
echo "Preparing $PWD for development use"
if [[ $1 == "" ]]; then
read -p "Enter your TDE GIT username []: " -e gituser
gituser=`sed -n "/^\[remote \"origin\"\]/,/url/s/\turl = http:\/\/\([^@]*\)@.*/\1/p" <\`git rev-parse --git-dir\`/config | grep -v "\(anonymous\|system\)"`
else
gituser=$1
fi
if [[ $gituser == "" ]]; then
read -p "Enter your TDE GIT username []: " -e gituser
fi
if [[ $gituser == "" ]]; then
gituser="anonymous"
fi
@ -19,8 +31,10 @@ fi
read -p "Enter your commit message []: " -e commitmessage
git submodule foreach "git commit -a -m \"$commitmessage\" || true"
git submodule foreach "sed -i \"s/system@scm\.trinitydesktop\.org/$gituser@scm\.trinitydesktop\.org/g\" .git/config"
git submodule foreach "git pull && git push origin master"
git submodule foreach "sed -i \"s/system@scm\.trinitydesktop\.org/$gituser@scm\.trinitydesktop\.org/g\" \`git rev-parse --git-dir\`/config"
git submodule foreach "git pull &&\
[[ \"\`git rev-parse HEAD\`\" == \"\`git rev-parse origin/$branch\`\" ]] ||\
git push origin HEAD"
RETCODE=$?
if [[ $RETCODE != 0 ]]; then
echo "Something went wrong"
@ -28,5 +42,7 @@ if [[ $RETCODE != 0 ]]; then
fi
git commit -a -m "$commitmessage" || true
sed -i "s/system@scm\.trinitydesktop\.org/$gituser@scm\.trinitydesktop\.org/g" .git/config
git pull && git push origin master || true
sed -i "s/system@scm\.trinitydesktop\.org/$gituser@scm\.trinitydesktop\.org/g" `git rev-parse --git-dir`/config
git pull &&\
[[ "`git rev-parse HEAD`" == "`git rev-parse origin/$branch`" ]] ||\
git push origin HEAD || true

@ -1,17 +1,29 @@
#!/bin/bash
if [[ ! -d .git ]]; then
if [[ ! -e .git ]] ||
[[ -z "`git rev-parse --git-dir 2>/dev/null`" ]]; then
echo "This script can only be run from a top level git directory. Exiting..."
exit 1
fi
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..."
exit 1
fi
echo "Preparing $PWD for development use"
if [[ $1 == "" ]]; then
read -p "Enter your TDE GIT username []: " -e gituser
gituser=`sed -n "/^\[remote \"origin\"\]/,/url/s/\turl = http:\/\/\([^@]*\)@.*/\1/p" <\`git rev-parse --git-dir\`/config | grep -v "\(anonymous\|system\)"`
else
gituser=$1
fi
if [[ $gituser == "" ]]; then
read -p "Enter your TDE GIT username []: " -e gituser
fi
if [[ $gituser == "" ]]; then
gituser="anonymous"
fi
@ -23,11 +35,15 @@ if [[ ! -e "$THISSCRIPT" ]]; then
exit 1
fi
git reset --hard HEAD
git clean -dxf
if [[ ! -z "`git status --porcelain --ignore-submodules`" ]]; then
git reset --hard HEAD
git clean -dxff
fi
git pull
git reset --hard HEAD
git clean -dxf
if [[ ! -z "`git status --porcelain --ignore-submodules`" ]]; then
git reset --hard HEAD
git clean -dxff
fi
if [[ -e .gitmodules ]]; then
if [[ $gituser == "anonymous" ]]; then
@ -38,9 +54,7 @@ if [[ -e .gitmodules ]]; then
git submodule init
git submodule update
git submodule foreach "git checkout master"
git submodule foreach "git pull"
git submodule foreach "$THISSCRIPT $gituser"
git submodule foreach "git checkout $branch && $THISSCRIPT $gituser"
git checkout -- .gitmodules
fi

@ -6,17 +6,28 @@ if [[ -e /var/lock/update-tde-git-submodules ]]; then
exit 0
fi
if [[ ! -e .git ]] ||
[[ -z "`git rev-parse --git-dir 2>/dev/null`" ]]; then
echo "Current directory does not contain a .git folder. Exiting..."
exit 1
fi
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..."
exit 1
fi
touch /var/lock/update-tde-git-submodules
PARENTDIR=$PWD
echo "Working in $PARENTDIR"
if [[ ! -d .git ]]; then
echo "Current directory does not contain a .git folder. Exiting..."
exit 1
fi
git pull
git reset --hard HEAD
git clean -d -x -f
if [[ ! -z "`git status --porcelain --ignore-submodules`" ]]; then
git reset --hard HEAD
git clean -dxff
fi
exec 3< submodules
while read <&3
@ -26,25 +37,29 @@ do
if [[ $DIR2UPDATE != "" ]]; then
echo "Attempting to reset submodule $DIR2UPDATE"
cd $PARENTDIR/$DIR2UPDATE/..
while [[ ! -d .git ]]; do
cd ../
done
git submodule init
git submodule update
cd `git rev-parse --show-toplevel`
if [[ -z "`grep \"^Updated: $PWD$\" /var/lock/update-tde-git-submodules`" ]]; then
echo "Updated: $PWD" >>/var/lock/update-tde-git-submodules
git submodule init
git submodule update
fi
cd $PARENTDIR/$DIR2UPDATE
git reset --hard HEAD
git clean -d -x -f
git checkout master
if [[ ! -z "`git status --porcelain --ignore-submodules`" ]]; then
git reset --hard HEAD
git clean -dxff
fi
git checkout $branch
git pull
cd ..
while [[ ! -d .git ]]; do
cd ../
done
cd `git rev-parse --show-toplevel`
echo "Committing changes to $PWD"
# git commit -a -m "Reset submodule to latest HEAD"
git add $PARENTDIR/$DIR2UPDATE
git commit $PARENTDIR/$DIR2UPDATE -m "Reset submodule $DIR2UPDATE to latest HEAD"
git push origin master
if [[ ! -z "`git status --porcelain $PARENTDIR/$DIR2UPDATE`" ]]; then
git add $PARENTDIR/$DIR2UPDATE
git commit $PARENTDIR/$DIR2UPDATE -m "Reset submodule $DIR2UPDATE to latest HEAD"
fi
if [[ "`git rev-parse HEAD`" != "`git rev-parse origin/$branch`" ]]; then
git push origin HEAD
fi
fi
done
exec 3>&-

Loading…
Cancel
Save