Skip to content

Commit b154b8b

Browse files
committed
make change for master to main
1 parent 0ec4f8d commit b154b8b

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

bin/asciibinder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ if cmd == 'clone'
300300
Dir.chdir(docs_basedir)
301301
puts "Tracking branch setup:"
302302
cloned_map.distro_branches.each do |doc_branch|
303-
next if doc_branch == 'master'
303+
next if doc_branch == 'main'
304304
puts "- #{doc_branch}"
305305
system("git branch #{doc_branch} origin/#{doc_branch}")
306306
end

features/support/env.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,9 @@ def initialize_test_repo(valid,multiple_distros=false,offset_docs_root=false)
299299
end
300300
system("cd #{working_dir} && git add . > /dev/null && git commit -am 'test commit' > /dev/null")
301301
if multiple_distros
302-
system("cd #{working_dir} && git checkout -b branch1 > /dev/null 2>&1 && git checkout -b branch2 > /dev/null 2>&1 && git checkout master > /dev/null 2>&1")
302+
system("cd #{working_dir} && git checkout -b branch1 > /dev/null 2>&1 && git checkout -b branch2 > /dev/null 2>&1 && git checkout main > /dev/null 2>&1")
303303
end
304-
set_initial_working_branch('master')
304+
set_initial_working_branch('main')
305305
end
306306
working_dir
307307
end
@@ -325,7 +325,7 @@ def initialize_remote_repo
325325
if run_command('create',[],remote_dir)[:status].exitstatus == 0
326326
clone_map = File.join(gem_root,'features','support','_clone_distro_map.yml')
327327
FileUtils.cp(clone_map,File.join(remote_dir,'_distro_map.yml'))
328-
system("cd #{remote_dir} && git add . > /dev/null && git commit -am 'remote commit' > /dev/null && git checkout -b branch1 > /dev/null 2>&1 && git checkout master > /dev/null 2>&1")
328+
system("cd #{remote_dir} && git add . > /dev/null && git commit -am 'remote commit' > /dev/null && git checkout -b branch1 > /dev/null 2>&1 && git checkout main > /dev/null 2>&1")
329329
else
330330
puts "ERROR: Could not initialize remote repo"
331331
exit 1

lib/ascii_binder/engine.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ def configure_and_generate_page(topic,branch_config,navigation)
467467

468468
doc = without_warnings { Asciidoctor.load topic_file, :header_footer => false, :safe => :unsafe, :attributes => page_attrs, :base_dir => "." }
469469
article_title = doc.doctitle || topic.name
470-
470+
471471
topic_html = doc.render
472472

473473
# This is logic bridges newer arbitrary-depth-tolerant code to

lib/ascii_binder/site_info.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def initialize(distro)
77
@name = distro.site.name
88
@url = distro.site.url
99
@distros = {}
10-
@branches = ['master']
10+
@branches = ['main']
1111
add_distro(distro)
1212
end
1313

lib/ascii_binder/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module AsciiBinder
2-
VERSION = "0.2.2"
2+
VERSION = "0.2.3"
33
end

0 commit comments

Comments
 (0)