diff --git a/scripts/cherry_pick_to_tags.sh b/scripts/cherry_pick_to_tags.sh deleted file mode 100644 index 97d1c1e8..00000000 --- a/scripts/cherry_pick_to_tags.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Copyright 2014 The Rust Project Developers. See the COPYRIGHT -# file at the top-level directory of this distribution and at -# http://rust-lang.org/COPYRIGHT. -# -# Licensed under the Apache License, Version 2.0 or the MIT license -# , at your -# option. This file may not be copied, modified, or distributed -# except according to those terms. - -# Exit if anything fails -set -e - -my_dir=`dirname $0` - -# Copy internal script to a temporary untracked file because an untracked -# file is kept by git when switching branches (that way we can update tags -# where this script doesn't exist). -cp "$my_dir/cherry_pick_to_tags_internal.sh" "$my_dir/cherry_pick_to_tags_internal_tmp.sh" -sh "$my_dir/cherry_pick_to_tags_internal_tmp.sh" $* -rm "$my_dir/cherry_pick_to_tags_internal_tmp.sh" diff --git a/scripts/cherry_pick_to_tags_internal.sh b/scripts/cherry_pick_to_tags_internal.sh deleted file mode 100644 index fd941bc2..00000000 --- a/scripts/cherry_pick_to_tags_internal.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# Copyright 2014 The Rust Project Developers. See the COPYRIGHT -# file at the top-level directory of this distribution and at -# http://rust-lang.org/COPYRIGHT. -# -# Licensed under the Apache License, Version 2.0 or the MIT license -# , at your -# option. This file may not be copied, modified, or distributed -# except according to those terms. - -# Exit if anything fails -set -e - -if [ "$#" -lt 2 ]; then - echo "Usage: $0 COMMIT_HASH TAGS" >&2 - exit 1 -fi - -commit="$1" - -echo "current branch $branch_name" -echo "commit hash $commit" - -# update tags -git fetch --tags - -shift -for tag in "$@"; do - echo "UPDATING TAG $tag" - { - git co "$tag" - - # cherry pick commit and update tag - git cherry-pick -x "$commit" - git tag -f "$tag" HEAD - - # switch back to previous branch - git co - - - # push the updated tag - git push origin "$tag" --force - } >/dev/null -done diff --git a/scripts/rebase.fish b/scripts/rebase.fish deleted file mode 100644 index de21658b..00000000 --- a/scripts/rebase.fish +++ /dev/null @@ -1,29 +0,0 @@ -git fetch --tags - -for x in (seq 1000) - set n (math $x + 1) - if not git checkout post_$n 2> /dev/null - if git checkout post_{$x}_new 2> /dev/null - git tag -f post_$x post_{$x}_new - git tag -d post_{$x}_new - git push origin post_$x --force - end - break - end - - if git checkout post_{$x}_new 2> /dev/null - echo \nrebasing post_$n on top of post_{$x}_new\n-------------------------------------- - if git checkout post_{$n}_new 2> /dev/null - echo Error: Multiple post_n_new tags! - exit 1 - end - if not git rebase --onto post_{$x}_new post_$x post_$n - exit 1 - end - - git tag post_{$n}_new HEAD - git tag -f post_$x post_{$x}_new - git tag -d post_{$x}_new - git push origin post_$x --force - end -end