diff options
Diffstat (limited to 'scripts/git')
-rwxr-xr-x | scripts/git/git-list-tor-branches.sh | 9 | ||||
-rwxr-xr-x | scripts/git/git-pull-all.sh | 18 |
2 files changed, 4 insertions, 23 deletions
diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh index dd3cf154b4..61e7b4a947 100755 --- a/scripts/git/git-list-tor-branches.sh +++ b/scripts/git/git-list-tor-branches.sh @@ -143,15 +143,12 @@ finish() { # List of all branches. These must be in order, from oldest to newest, with # maint before release. -branch maint-0.4.5 -branch release-0.4.5 - -branch maint-0.4.6 -branch release-0.4.6 - branch maint-0.4.7 branch release-0.4.7 +branch maint-0.4.8 +branch release-0.4.8 + branch main finish diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index bbe2576d8e..12a0372f73 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -168,19 +168,6 @@ function fetch_origin fi } -# Fetch tor-gitlab pull requests. No arguments. -function fetch_tor_gitlab -{ - local cmd="git fetch tor-gitlab" - printf "%s Fetching tor-gitlab..." "$MARKER" - if [ $DRY_RUN -eq 0 ]; then - msg=$( eval "$cmd" 2>&1 ) - validate_ret $? "$msg" - else - printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" - fi -} - ############### # Entry point # ############### @@ -188,10 +175,7 @@ function fetch_tor_gitlab # Get into our origin repository. goto_repo "$ORIGIN_PATH" -# First, fetch tor-gitlab -fetch_tor_gitlab - -# Then, fetch the origin. +# Fetch the origin. fetch_origin # Go over all configured worktree. |