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"
# 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 "git push"
-# fi
+ git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+ test_or_die "git push"
fi
else
restore_terminal_title
- true;
+ return 0
}
# shows the local changes in a repository.
restore_terminal_title
- true;
+ return 0
}
# reports any files that are not already known to the upstream repository.
restore_terminal_title
- true
+ return 0
}
# checks in all the folders in a specified list.
function careful_git_update()
{
-echo A
- this_branch="$(my_branch_name)"
+ local this_branch="$(my_branch_name)"
#we want my branch here, don't we? not like parent or anything?
check_branch_state "$this_branch"
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"
-echo B
+echo NOW REMOTE UPDATE
# first update all our remote branches to their current state from the repos.
git remote update
test_or_die "git remote update"
-echo C
+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 D
-#the above are just not enough. now doing what i have to do to repair things.
-branch_list=$(git branch |grep -v '^\*')
-
-
-echo E
-
-echo The rest of pull is not being done yet.
-return 1
-
-
-
-# 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 branch --track ${remote#origin/} $remote 2>/dev/null
-##hmmm: ignoring errors from these, since they are continual.
-##hmmm: if we could find a way to not try to track with a local branch when there's already one present, that would be swell. it's probably simple.
-# done
-#
-##hmmm: well, one time it failed without the fetch. i hope that's because the fetch is actually needed and not because the whole approach is fubar.
-# git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-# test_or_die "git fetch"
-#
-# git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-# test_or_die "git pull"
+echo DONE CAREFUL UPDATE
}
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.
-
-# 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"
-
-#any parms needed?
- careful_git_update
-
+ 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.
restore_terminal_title
- true
+ return 0
}
# gets all the updates for a list of folders under revision control.
projects / feisty_meow.git / blobdiff