Skip to content

Commit a6ab807

Browse files
committed
Revert "Recover notes inconsistencies as well"
This reverts commit 15b4949.
1 parent 622acce commit a6ab807

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

bin/git-sync-check.rb

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,13 @@ def self.check_consistency
119119
rescue GitSyncCheck::Errors => e
120120
attempts -= 1
121121
if attempts > 0
122-
# Automatically fix inconsistency if it's master or notes, but never sync random new branches.
123-
['refs/heads/master', 'refs/notes/commits'].each do |ref|
124-
if e.errors.key?(ref)
125-
remote_rev, local_rev = e.errors['refs/heads/master']
126-
puts "Fixing inconsistency ref:#{ref.inspect} remote:#{remote_rev.inspect} local:#{local_rev.inspect}"
127-
unless system('/home/git/git.ruby-lang.org/bin/update-ruby.sh', File.basename(ref))
128-
raise "Failed to execute update-ruby.sh for #{ref}"
129-
end
122+
# Automatically fix inconsistency if it's master, but never sync random new branches.
123+
ref = 'refs/heads/master'
124+
if e.errors.key?(ref)
125+
remote_rev, local_rev = e.errors['refs/heads/master']
126+
puts "Fixing inconsistency ref:#{ref.inspect} remote:#{remote_rev.inspect} local:#{local_rev.inspect}"
127+
unless system('/home/git/git.ruby-lang.org/bin/update-ruby.sh', File.basename(ref))
128+
raise "Failed to execute update-ruby.sh for #{ref}"
130129
end
131130
end
132131
sleep 5

0 commit comments

Comments
 (0)