diff options
author | Adam Warner <me@adamwarner.co.uk> | 2021-10-06 03:19:28 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-06 03:19:28 +0300 |
commit | 0ea7344c309a81c64fe11769c0921cd0141b935e (patch) | |
tree | 12c2e90d2ff99b22e5173495c247f1a6a6855f98 /automated install/basic-install.sh | |
parent | 55dce14655a0188998c6ce5603092c387d130565 (diff) |
add --no-rebase to the git pull command(s) to squelch hint message in newer versions of git (#4226)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Diffstat (limited to 'automated install/basic-install.sh')
-rwxr-xr-x | automated install/basic-install.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 422c1904..9cba9339 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -514,7 +514,7 @@ update_repo() { git stash --all --quiet &> /dev/null || true # Okay for stash failure git clean --quiet --force -d || true # Okay for already clean directory # Pull the latest commits - git pull --quiet &> /dev/null || return $? + git pull --no-rebase --quiet &> /dev/null || return $? # Check current branch. If it is master, then reset to the latest available tag. # In case extra commits have been added after tagging/release (i.e in case of metadata updates/README.MD tweaks) curBranch=$(git rev-parse --abbrev-ref HEAD) @@ -2028,7 +2028,7 @@ checkout_pull_branch() { # Data in the repositories is public anyway so we can make it readable by everyone (+r to keep executable permission if already set by git) chmod -R a+rX "${directory}" - git_pull=$(git pull || return 1) + git_pull=$(git pull --no-rebase || return 1) if [[ "$git_pull" == *"up-to-date"* ]]; then printf " %b %s\\n" "${INFO}" "${git_pull}" |