Skip to content

Remove legacy svn and only rely on git sha1 #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ylecuyer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove legacy svn and only rely on git sha1 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion share/ruby-bisect/check_revision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source "$RUBY_BISECT_DIR/util.sh"
# Finds svn_id of last commit
#
function last_revision() {
git show -s --pretty=format:'%b' | grep -E -o "trunk@[0-9]+" | cut -d@ -f2
git show -s --pretty=format:'%h'
}

# Construct names
Expand Down
11 changes: 2 additions & 9 deletions share/ruby-bisect/ruby-bisect.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@ function clone_ruby() {
"$git_extras_dir/bin/git-force-clone" https://github.com/ruby/ruby "$ruby_dir"
}

#
# Translates a commit's svn id to its git sha1 using git's log
#
function svn2git {
git_in_ruby_dir log --all --grep="trunk@$1" --pretty=format:'%h'
}

#
# Prints usage information
#
Expand Down Expand Up @@ -117,11 +110,11 @@ function parse_options() {
}

function parse_revisions() {
good_revision=$(svn2git "$good_svn_id")
good_revision=$(echo "$good_svn_id")

if [[ -v bad_svn_id ]]
then
bad_revision=$(svn2git "$bad_svn_id")
bad_revision=$(echo "$bad_svn_id")
else
bad_revision=$(git -C "$ruby_dir" show -s --pretty=format:'%h')
fi
Expand Down