diff options
| -rwxr-xr-x | git/branch.sh | 2 | ||||
| -rwxr-xr-x | git/checkout.sh | 2 | ||||
| -rwxr-xr-x | git/commit.sh | 2 | ||||
| -rwxr-xr-x | git/diff.sh | 2 | ||||
| -rwxr-xr-x | git/fetch.sh | 4 | ||||
| -rwxr-xr-x | git/merge.sh | 2 | ||||
| -rw-r--r-- | git/modules | 7 | ||||
| -rwxr-xr-x | git/pull.sh | 4 | ||||
| -rwxr-xr-x | git/push.sh | 2 | ||||
| -rwxr-xr-x | git/rebase.sh | 2 | ||||
| -rwxr-xr-x | git/stash.sh | 2 | ||||
| -rwxr-xr-x | git/stat.sh | 2 | ||||
| -rwxr-xr-x | git/tag.sh | 2 |
13 files changed, 17 insertions, 18 deletions
diff --git a/git/branch.sh b/git/branch.sh index 6827eb3..4362fb4 100755 --- a/git/branch.sh +++ b/git/branch.sh @@ -7,7 +7,7 @@ self=`realpath $0` wd=`pwd` -for i in $odb_modules; do +for i in $modules; do echo "branch $i" 1>&2 cd $i git branch $* diff --git a/git/checkout.sh b/git/checkout.sh index c8adf54..2cf5717 100755 --- a/git/checkout.sh +++ b/git/checkout.sh @@ -12,7 +12,7 @@ if [ "$1" = "" ]; then exit 1 fi -for i in $odb_modules; do +for i in $modules; do echo "checkout $i" 1>&2 cd $i git checkout $* diff --git a/git/commit.sh b/git/commit.sh index e5a1950..deecada 100755 --- a/git/commit.sh +++ b/git/commit.sh @@ -27,7 +27,7 @@ if test ! -s "$msg_file"; then exit 1 fi -for i in $odb_modules; do +for i in $modules; do echo "commit $i" 1>&2 cd $i git add . diff --git a/git/diff.sh b/git/diff.sh index 6412543..19737e9 100755 --- a/git/diff.sh +++ b/git/diff.sh @@ -7,7 +7,7 @@ self=`realpath $0` wd=`pwd` -for i in $all_modules; do +for i in $modules; do echo "diff $i" 1>&2 cd $i git --no-pager diff diff --git a/git/fetch.sh b/git/fetch.sh index 36f60bd..a18be15 100755 --- a/git/fetch.sh +++ b/git/fetch.sh @@ -7,8 +7,8 @@ self=`realpath $0` wd=`pwd` -for i in $all_modules; do - echo "pull $i" 1>&2 +for i in $modules; do + echo "fetch $i" 1>&2 cd $i git fetch $* cd $wd diff --git a/git/merge.sh b/git/merge.sh index c9ae535..4f12f8c 100755 --- a/git/merge.sh +++ b/git/merge.sh @@ -12,7 +12,7 @@ if [ "$1" = "" ]; then exit 1 fi -for i in $odb_modules; do +for i in $modules; do echo "merge $i" 1>&2 cd $i git merge $* diff --git a/git/modules b/git/modules index a258c67..0bb81b5 100644 --- a/git/modules +++ b/git/modules @@ -1,4 +1,4 @@ -odb_modules=" \ +modules=" \ libodb \ libodb-mysql \ libodb-sqlite \ @@ -7,6 +7,5 @@ libodb-boost \ libodb-qt \ odb \ examples \ -tests" - -all_modules="$odb_modules etc" +tests \ +etc" diff --git a/git/pull.sh b/git/pull.sh index 51fe2a1..cf94cf0 100755 --- a/git/pull.sh +++ b/git/pull.sh @@ -7,9 +7,9 @@ self=`realpath $0` wd=`pwd` -for i in $all_modules; do +for i in $modules; do echo "pull $i" 1>&2 cd $i - git pull --rebase $* + git pull $* cd $wd done diff --git a/git/push.sh b/git/push.sh index a97edea..cd1c1b8 100755 --- a/git/push.sh +++ b/git/push.sh @@ -8,7 +8,7 @@ self=`realpath $0` wd=`pwd` br=$1 -for i in $all_modules; do +for i in $modules; do echo "push $i" 1>&2 cd $i diff --git a/git/rebase.sh b/git/rebase.sh index 4d7806b..67313b1 100755 --- a/git/rebase.sh +++ b/git/rebase.sh @@ -12,7 +12,7 @@ if [ "$1" = "" ]; then exit 1 fi -for i in $odb_modules; do +for i in $modules; do echo "rebase $i" 1>&2 cd $i git rebase $* diff --git a/git/stash.sh b/git/stash.sh index 93a168d..63a6022 100755 --- a/git/stash.sh +++ b/git/stash.sh @@ -7,7 +7,7 @@ self=`realpath $0` wd=`pwd` -for i in $odb_modules; do +for i in $modules; do echo "stash $i" 1>&2 cd $i git stash $* diff --git a/git/stat.sh b/git/stat.sh index 300432f..39eb081 100755 --- a/git/stat.sh +++ b/git/stat.sh @@ -7,7 +7,7 @@ self=`realpath $0` wd=`pwd` -for i in $all_modules; do +for i in $modules; do echo "stat $i" 1>&2 cd $i git status @@ -12,7 +12,7 @@ if [ "$1" = "" ]; then exit 1 fi -for i in $all_modules; do +for i in $modules; do echo "tag $i" 1>&2 cd $i git tag -a $1 -m "Tag version $1" |