projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stopped redundant merges, added reconfigure note
[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 75f344cf66ab8485f0e8b980f6b83c8eef924859..e1cb4192d4bcd8de812c39bf38e44bcb31fb8686 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-64,7
+64,7
@@
function do_checkin()
if [ $nicedir == "." ]; then
nicedir=$(\pwd)
fi
if [ $nicedir == "." ]; then
nicedir=$(\pwd)
fi
- local blatt="echo
checking in '$nicedir'...
"
+ local blatt="echo
-n checking in '$nicedir'...
"
do_update "$directory"
test_or_die "repository update--this should be fixed before check-in."
do_update "$directory"
test_or_die "repository update--this should be fixed before check-in."
@@
-383,6
+383,10
@@
function do_careful_git_update()
local bran
for bran in $branch_list; do
# echo "synchronizing remote branch: $bran"
local bran
for bran in $branch_list; do
# echo "synchronizing remote branch: $bran"
+ if [ "$this_branch" == "$bran" ]; then
+ echo "skipping redundant update on initial branch: $bran"
+ continue;
+ fi
git checkout "$bran" | $TO_SPLITTER
promote_pipe_return 0
test_or_die "git switching checkout to remote branch: $bran"
git checkout "$bran" | $TO_SPLITTER
promote_pipe_return 0
test_or_die "git switching checkout to remote branch: $bran"