projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
working on revamp alias
[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 0c8cec27eb097936b340c611d8c7bda5fbf27b7a..0c7ac401b6305cc595e4e7eedea2728c0f55b9d3 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-243,7
+243,10
@@
function checkin_list()
restore_terminal_title
}
restore_terminal_title
}
-# does a careful git update on all the folders in the specified list.
+# does a careful update on all the folders in the specified list;
+# it looks in the REPOSITORY_LIST for those names and updates them.
+# this is just like checkout_list, but it's for the puffing up action
+# we need to do on git.
function puff_out_list()
{
# make the list of directories unique.
function puff_out_list()
{
# make the list of directories unique.
@@
-379,9
+382,15
@@
function do_careful_git_update()
test_or_die "changing to directory: $directory"
if [ ! -d ".git" ]; then
test_or_die "changing to directory: $directory"
if [ ! -d ".git" ]; then
- # we ignore if they're jumping into a non-useful folder, but also tell them.
- echo "Directory is not a git repository: $directory"
- return 0
+
+# # we ignore if they're jumping into a non-useful folder, but also tell them.
+# echo "Directory is not a git repository: $directory"
+# return 0
+
+ # new and better approach; just boil down to a getem action.
+ popd &>/dev/null
+ do_update $directory
+ return $?
fi
local this_branch="$(my_branch_name)"
fi
local this_branch="$(my_branch_name)"
@@
-411,7
+420,7
@@
function do_careful_git_update()
remote_branch_info=$(git ls-remote --heads origin $bran 2>/dev/null)
if [ ! -z "$remote_branch_info" ]; then
# we are pretty sure the remote branch does exist.
remote_branch_info=$(git ls-remote --heads origin $bran 2>/dev/null)
if [ ! -z "$remote_branch_info" ]; then
# we are pretty sure the remote branch does exist.
- git pull $PULL_ADDITION origin "$bran" | $TO_SPLITTER
+ git pull
--tags
$PULL_ADDITION origin "$bran" | $TO_SPLITTER
# we may want to choose to do fast forward, to avoid crazy multiple merge histories
# without any changes in them. --no-ff
promote_pipe_return 0
# we may want to choose to do fast forward, to avoid crazy multiple merge histories
# without any changes in them. --no-ff
promote_pipe_return 0
@@
-425,7
+434,7
@@
function do_careful_git_update()
# now pull down any changes in our own origin in the repo, to stay in synch
# with any changes from others.
# now pull down any changes in our own origin in the repo, to stay in synch
# with any changes from others.
- git pull $PULL_ADDITION --all | $TO_SPLITTER
+ git pull
--tags
$PULL_ADDITION --all | $TO_SPLITTER
#is the above really important when we did this branch already in the loop?
#it does an --all, but is that effective or different? should we be doing that in above loop?
# --no-ff
#is the above really important when we did this branch already in the loop?
#it does an --all, but is that effective or different? should we be doing that in above loop?
# --no-ff
@@
-467,7
+476,7
@@
function do_update()
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
- git pull $PULL_ADDITION 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+ git pull
--tags
$PULL_ADDITION 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
#ordinary pulls should be allowed to do fast forward: --no-ff
promote_pipe_return 0
test_or_die "git pull of origin"
#ordinary pulls should be allowed to do fast forward: --no-ff
promote_pipe_return 0
test_or_die "git pull of origin"