summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-07 01:10:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-07 01:10:15 -0600
commita2610d4e320f8a51ee54d4c1644c3fb28a1ad8bf (patch)
treea6c410be4ca6b0be39ac4f066a524100abe006c4
parent93bbe2060e7b78f7f21b238cb176ab2fbbc79f04 (diff)
downloadscripts-a2610d4e320f8a51ee54d4c1644c3fb28a1ad8bf.tar.gz
scripts-a2610d4e320f8a51ee54d4c1644c3fb28a1ad8bf.zip
Update the GIT helper scripts
-rwxr-xr-xcommit_all_submodules4
-rwxr-xr-xswitch_all_submodules_to_head_and_clean3
2 files changed, 7 insertions, 0 deletions
diff --git a/commit_all_submodules b/commit_all_submodules
index cddb52e..fc80c07 100755
--- a/commit_all_submodules
+++ b/commit_all_submodules
@@ -21,3 +21,7 @@ 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 push origin master || true"
+
+git commit -a -m \"$commitmessage\" || true
+sed -i \"s/system@scm\.trinitydesktop\.org/$gituser@scm\.trinitydesktop\.org/g\" .git/config
+git push origin master || true
diff --git a/switch_all_submodules_to_head_and_clean b/switch_all_submodules_to_head_and_clean
index 5b409b8..c395e62 100755
--- a/switch_all_submodules_to_head_and_clean
+++ b/switch_all_submodules_to_head_and_clean
@@ -25,6 +25,9 @@ fi
git reset --hard HEAD
git clean -dxf
+git pull
+git reset --hard HEAD
+git clean -dxf
if [[ -e .gitmodules ]]; then
if [[ $gituser == "anonymous" ]]; then