From 5f77718fdcb9dfc44f46e0202fdccbce9fd7b8d3 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Wed, 3 Jan 2018 11:56:10 -0500 Subject: [PATCH] trying without --no-ff the fast forward feature seems important to avoid unnecessary merge messages from checkin. we need to be careful at merge time with a branch to say: git merge --no-ff because otherwise we would lose all the changes that occurred on the branch. but remembering every trivial merge, even those without contents, is not good, so --no-ff needs to be dumped for most pulls. --- scripts/rev_control/version_control.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index b1035c53..497e0f8c 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -394,7 +394,9 @@ 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. - git pull --no-ff origin "$bran" | $TO_SPLITTER + git pull 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 fi test_or_die "git pull of remote branch: $bran" @@ -406,7 +408,10 @@ 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. - git pull --no-ff --all | $TO_SPLITTER + git pull --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 promote_pipe_return 0 test_or_die "git pulling all upstream" @@ -445,9 +450,10 @@ function do_update() elif [ -d ".git" ]; then if test_writeable ".git"; then $blatt - git pull --no-ff 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER + git pull 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 without fast forwards" + test_or_die "git pull of origin" fi else # this is not an error necessarily; we'll just pretend they planned this. -- 2.34.1