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:
02c681c
)
added tags to pull
author
Chris Koeritz
<fred@gruntose.com>
Mon, 15 Jan 2018 16:52:50 +0000
(11:52 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Mon, 15 Jan 2018 16:52:50 +0000
(11:52 -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 0c8cec27eb097936b340c611d8c7bda5fbf27b7a..b96bcb3431fe55aa4f7bb478bc85e3300a08cd6b 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-411,7
+411,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
+425,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
+467,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"