projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arghsomeness
[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 508c08a0825c808726e7334fe208d411575d6484..3c6685d67ad1fae3a2c4a4c500be88b9345e7338 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-77,6
+77,10
@@
function do_checkin()
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
+
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
+
# snag all new files. not to everyone's liking.
git add --all .
test_or_die "git add all new files"
# snag all new files. not to everyone's liking.
git add --all .
test_or_die "git add all new files"
@@
-87,6
+91,11
@@
function do_checkin()
git commit .
test_or_die "git commit"
fi
git commit .
test_or_die "git commit"
fi
+# # upload the files to the server so others can see them.
+# git push 2>&1 | grep -v "X11 forwarding request failed"
+# if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+# test_or_die "git push"
+
# catch if the diff-index failed somehow.
test_or_die "git diff-index"
# catch if the diff-index failed somehow.
test_or_die "git diff-index"
@@
-272,10
+281,15
@@
function do_update()
if test_writeable ".git"; then
$blatt
if test_writeable ".git"; then
$blatt
-#let's start over clean here...
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
- git fetch origin
- test_or_die "git fetch origin"
+# git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+# if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+# test_or_die "git pull"
+
+
+#let's start over clean here...
git remote update
test_or_die "git remote update"
git remote update
test_or_die "git remote update"
@@
-298,7
+312,11
@@
else
echo "Diverged"
fi
echo "Diverged"
fi
-echo The rest of pull is not done yet.
+echo The rest of pull is not being done yet.
+return 1
+
+ git pull --no-ff origin
+ test_or_die "git fetch origin"
# reslog=$(git log HEAD..origin/master --oneline)
# reslog=$(git log HEAD..origin/master --oneline)