diff --git a/share/ruby-bisect/check_revision.sh b/share/ruby-bisect/check_revision.sh index ecf7555..f9ae4f0 100755 --- a/share/ruby-bisect/check_revision.sh +++ b/share/ruby-bisect/check_revision.sh @@ -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 diff --git a/share/ruby-bisect/ruby-bisect.sh b/share/ruby-bisect/ruby-bisect.sh index 9620479..5c6c407 100644 --- a/share/ruby-bisect/ruby-bisect.sh +++ b/share/ruby-bisect/ruby-bisect.sh @@ -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 # @@ -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