projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1f53351
)
hoping this is the right deal now
author
Chris Koeritz
<fred@gruntose.com>
Fri, 10 Nov 2017 18:37:32 +0000
(13:37 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Fri, 10 Nov 2017 18:37:32 +0000
(13:37 -0500)
scripts/rev_control/version_control.sh
patch
|
blob
|
history
diff --git
a/scripts/rev_control/version_control.sh
b/scripts/rev_control/version_control.sh
index 247921d626ad543793095e3a6d1861cfbf09a488..96d4e4dca23b81245b2bbe2f2c73286ae5da5ff5 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-282,7
+282,6
@@
sep
function careful_git_update()
{
function careful_git_update()
{
-echo A
local this_branch="$(my_branch_name)"
#we want my branch here, don't we? not like parent or anything?
local this_branch="$(my_branch_name)"
#we want my branch here, don't we? not like parent or anything?
@@
-293,11
+292,12
@@
echo A
#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. *&@#*&@#
#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 D
+echo D
OING 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
# 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
git checkout "$bran"
test_or_die "git checking out remote branch: $bran"
git pull --no-ff
@@
-307,24
+307,21
@@
echo D
git checkout "$this_branch"
test_or_die "git checking out our current branch: $this_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"
# 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"
# 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 E
-
-echo The rest of pull is not being done yet.
-return 1
-
+echo DONE CAREFUL UPDATE
+ return 0
# below has older shards of partial knowledge.
# below has older shards of partial knowledge.
@@
-379,17
+376,9
@@
function do_update()
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.
-
- git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+ git pull --no-ff origin 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
- test_or_die "git pull"
-
-#any parms needed?
-##no! can't be done here or commit fudges up careful_git_update
-
+ 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.
fi
else
# this is not an error necessarily; we'll just pretend they planned this.