projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated version
[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 efda594872aec436582caedc33719782f0af0520..84607308ff50b3ade5a2fff5b0e513ce310c655c 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-88,7
+88,7
@@
function do_checkin()
fi
# a new set of steps we have to take to make sure the branch integrity is good.
fi
# a new set of steps we have to take to make sure the branch integrity is good.
- careful_git_update
+
do_
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.
# 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.
@@
-219,11
+219,18
@@
function squash_first_few_crs()
fi
}
fi
}
+#hmmm: the below are git specific and should be named that way.
+
+function all_branch_names()
+{
+ echo "$(git branch -vv | cut -d ' ' -f2)"
+}
+
# a helpful method that reports the git branch for the current directory's
# git repository.
function my_branch_name()
{
# a helpful method that reports the git branch for the current directory's
# git repository.
function my_branch_name()
{
- echo "$(git branch | grep '\*' | cut -d ' ' -f2)"
+ echo "$(git branch
-vv
| grep '\*' | cut -d ' ' -f2)"
}
#this had a -> in it at one point for not matching, didn't it?
}
#this had a -> in it at one point for not matching, didn't it?
@@
-272,12
+279,10
@@
sep
# 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
# other methods.
# 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
# other methods.
-function careful_git_update()
+function
do_
careful_git_update()
{
local this_branch="$(my_branch_name)"
{
local this_branch="$(my_branch_name)"
-#this step didn't help before, and it seems redundant now.
-#hmmm, maybe it is needed. and people did seem to want it first, so trying that.
# first update all our remote branches to their current state from the repos.
git remote update
test_or_die "git remote update"
# first update all our remote branches to their current state from the repos.
git remote update
test_or_die "git remote update"
@@
-288,14
+293,14
@@
function careful_git_update()
# test_or_continue "branch state check"
# echo the branch state is $state
# test_or_continue "branch state check"
# echo the branch state is $state
- # th
e 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 '^\*'
)
+ # th
is code is now doing what i have to do when i repair the repo. and it seems to be good so far
.
+ local branch_list=$(
all_branch_names
)
local bran
for bran in $branch_list; do
# echo "synchronizing remote branch: $bran"
git checkout "$bran"
test_or_die "git checking out remote branch: $bran"
local bran
for bran in $branch_list; do
# echo "synchronizing remote branch: $bran"
git checkout "$bran"
test_or_die "git checking out remote branch: $bran"
- git pull --no-ff
+ git pull --no-ff
origin "$bran"
test_or_die "git pull of remote branch: $bran"
done
# now switch back to our branch.
test_or_die "git pull of remote branch: $bran"
done
# now switch back to our branch.