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.
+ # put all changed and new files in the commit. not to everyone's liking.
git add --all .
test_or_die "git add all new files"
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"
+ # a new set of steps we have to take to make sure the branch integrity is good.
+ careful_git_update
# we continue on to the push, even if there were no changes this time, because
# there could already be committed changes that haven't been pushed yet.
- local myself="$(my_branch_name)"
- local parent="$(parent_branch_name)"
-
# upload any changes to the upstream repo so others can see them.
- if [ "$myself" != "$parent" ]; then
- git push origin "$(myself)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- test_or_die "git push to origin: $myself"
- else
- # this branch is the same as the parent, so just push.
- git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- test_or_die "normal git push"
- fi
+ git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+ test_or_die "git push"
fi
else
# git repository.
function my_branch_name()
{
- echo "$(git branch | grep \* | cut -d ' ' -f2)"
+ echo "$(git branch | grep '\*' | cut -d ' ' -f2)"
}
+#this had a -> in it at one point for not matching, didn't it?
# this reports the upstream branch for the current repo.
-function parent_branch_name()
+##function parent_branch_name()
+##{
+ ##echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
+##}
+
+# this exits with 0 for success (normal bash behavior) when up to date. if the branch is not up to date,
+# then these values are returned:
+#DOCUMENT THE VALUES
+# reference: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
+function check_branch_state()
{
- echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
-}
+ local branch="$1"; shift
-# gets the latest versions of the assets from the upstream repository.
-function do_update()
-{
- directory="$1"; shift
+ local to_return=120 # unknown issue.
- save_terminal_title
+sep
- # make a nice echoer since we want to use it inside conditions below.
- local nicedir="$directory"
- if [ $nicedir == "." ]; then
- nicedir=$(\pwd)
- fi
- local blatt="echo retrieving '$nicedir'..."
+ LOCAL=$(git rev-parse @)
+ REMOTE=$(git rev-parse "$branch")
+ BASE=$(git merge-base @ "$branch")
+var branch LOCAL REMOTE BASE
- pushd "$directory" &>/dev/null
- if [ -d "CVS" ]; then
- if test_writeable "CVS"; then
- $blatt
- cvs update . | $TO_SPLITTER
- test_or_die "cvs update"
- fi
- elif [ -d ".svn" ]; then
- if test_writeable ".svn"; then
- $blatt
- svn update . | $TO_SPLITTER
- test_or_die "svn update"
- fi
- elif [ -d ".git" ]; then
- if test_writeable ".git"; then
- $blatt
+ if [ "$LOCAL" == "$REMOTE" ]; then
+ echo "Up-to-date"
+ to_return=0
+ elif [ "$LOCAL" == "$BASE" ]; then
+ echo "Need to pull"
+ to_return=1
+ elif [ "$REMOTE" == "$BASE" ]; then
+ echo "Need to push"
+ to_return=2
+ else
+ echo "Diverged"
+ to_return=3
+ fi
-# classic implementation, but only works with one master branch.
-# fixes will be forthcoming from development branch.
+sep
-# 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"
+ return $to_return
+}
+# the git update process just gets more and more complex when you bring in
+# branches, so we've moved this here to avoid having a ton of code in the
+# do_checkin method.
+function careful_git_update()
+{
-#let's start over clean here...
+ local this_branch="$(my_branch_name)"
+
+#we want my branch here, don't we? not like parent or anything?
+ check_branch_state "$this_branch"
+ state=$?
+ test_or_continue "branch state check"
+ echo the branch state is $state
+#need to instead do something here if fails.
+# above is worse than useless code; in the situations i'm seeing fail, it reports no changes. *&@#*&@#
+
+echo DOING BRANCH WALKER
+ # the above are just not enough. this code is now doing what i have to do when i repair the repo.
+ local branch_list=$(git branch |grep -v '^\*')
+ local bran
+ for bran in $branch_list; do
+echo GETTING LATEST ON: $bran
+ git checkout "$bran"
+ test_or_die "git checking out remote branch: $bran"
+ git pull --no-ff
+ test_or_die "git pull of remote branch: $bran"
+ done
+ # now switch back to our branch.
+ git checkout "$this_branch"
+ test_or_die "git checking out our current branch: $this_branch"
- git remote update
- test_or_die "git remote update"
+echo NOW REMOTE UPDATE
-# from: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
-UPSTREAM=$(parent_branch_name)
-#argh: original UPSTREAM='${1:-'\''@{u}'\''}'
-LOCAL=$(git rev-parse @)
-REMOTE=$(git rev-parse "$UPSTREAM")
-BASE=$(git merge-base @ "$UPSTREAM")
-var UPSTREAM LOCAL REMOTE BASE
+ # first update all our remote branches to their current state from the repos.
+ git remote update
+ test_or_die "git remote update"
-if [ "$LOCAL" == "$REMOTE" ]; then
- echo "Up-to-date"
-elif [ "$LOCAL" == "$BASE" ]; then
- echo "Need to pull"
-elif [ "$REMOTE" == "$BASE" ]; then
- echo "Need to push"
-else
- echo "Diverged"
-fi
+echo NOW THE FULL PULL
+ # now pull down any changes in our own origin in the repo, to stay in synch
+ # with any changes from others.
+ git pull --no-ff --all
+ test_or_die "git pulling all upstream"
-echo The rest of pull is not being done yet.
-return 1
+echo DONE CAREFUL UPDATE
- git pull --no-ff origin
- test_or_die "git fetch origin"
+ return 0
+# below has older shards of partial knowledge.
# reslog=$(git log HEAD..origin/master --oneline)
# if [[ "${reslog}" != "" ]] ; then
# git merge origin/master
-
-
# # from very helpful page:
# # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
# for remote in $( git branch -r | grep -v -- '->' ); do
#
# git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
# test_or_die "git pull"
+
+}
+
+# gets the latest versions of the assets from the upstream repository.
+function do_update()
+{
+ directory="$1"; shift
+
+ save_terminal_title
+
+ # make a nice echoer since we want to use it inside conditions below.
+ local nicedir="$directory"
+ if [ $nicedir == "." ]; then
+ nicedir=$(\pwd)
+ fi
+ local blatt="echo retrieving '$nicedir'..."
+
+ pushd "$directory" &>/dev/null
+ if [ -d "CVS" ]; then
+ if test_writeable "CVS"; then
+ $blatt
+ cvs update . | $TO_SPLITTER
+ test_or_die "cvs update"
+ fi
+ elif [ -d ".svn" ]; then
+ if test_writeable ".svn"; then
+ $blatt
+ svn update . | $TO_SPLITTER
+ test_or_die "svn update"
+ fi
+ elif [ -d ".git" ]; then
+ if test_writeable ".git"; then
+ $blatt
+ git pull --no-ff origin 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+ if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+ test_or_die "git pull of origin without fast forwards"
fi
else
# this is not an error necessarily; we'll just pretend they planned this.
projects / feisty_meow.git / blobdiff