projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added experiments folder to snarfage
[feisty_meow.git]
/
scripts
/
rev_control
/
version_control.sh
diff --git
a/scripts/rev_control/version_control.sh
b/scripts/rev_control/version_control.sh
index 0c25692aee5a8cb1752a3555bc09e4e28e288d36..9f955d28ab2d62d619f2bab9c7e0a7a65c186776 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-81,11
+81,16
@@
function do_checkin()
# catch if the diff-index failed somehow.
retval+=$?
# catch if the diff-index failed somehow.
retval+=$?
+#push the changes to where? locally?
+ git push 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+ retval+=${PIPESTATUS[0]}
+
# upload any changes to the upstream repo so others can see them.
# upload any changes to the upstream repo so others can see them.
- git push 2>&1
-#| grep -v "X11 forwarding request failed"
-#have to do pipestatus if want to keep the above.
- retval+=$?
+ if [ "$(git_branch_name)" != "master" ]; then
+ git push origin "$(git_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+ retval+=${PIPESTATUS[0]}
+ fi
+
fi
else
# nothing there. it's not an error though.
fi
else
# nothing there. it's not an error though.
@@
-211,6
+216,13
@@
function squash_first_few_crs()
fi
}
fi
}
+# a helpful method that reports the git branch for the current directory's
+# git repository.
+function git_branch_name()
+{
+ echo "$(git branch | grep \* | cut -d ' ' -f2-)"
+}
+
# gets the latest versions of the assets from the upstream repository.
function do_update()
{
# gets the latest versions of the assets from the upstream repository.
function do_update()
{
@@
-242,8
+254,15
@@
function do_update()
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
+ retval=0
+
+ if [ "$(git_branch_name)" != "master" ]; then
+ git pull origin master 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+ retval+=${PIPESTATUS[0]}
+ fi
+
git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
- retval=${PIPESTATUS[0]}
+ retval
+
=${PIPESTATUS[0]}
fi
else
# this is not an error necessarily; we'll just pretend they planned this.
fi
else
# this is not an error necessarily; we'll just pretend they planned this.