imposed master branch

levels/add.rb

@@ -1,10 +1,11 @@
 difficulty 1
-description "There is a file in your folder called `README`, you should add it to your staging area
-Note: You start each level with a new repo. Don't look for files from the previous one."
+description "There is a file in your folder called `README`; add it to your staging area.
+Note: Each level starts with a new repo. Don't look for files of the previous one."
 
 setup do
   repo.init
   FileUtils.touch("README")
+  system "git branch -m master"
 end
 
 solution do

levels/bisect.rb

@@ -1,9 +1,10 @@
 difficulty 3
-description "A bug was introduced somewhere along the way. You know that running `ruby prog.rb 5` should output 15. You can also run `make test`. What are the first 7 chars of the hash of the commit that introduced the bug."
+description "A bug was introduced somewhere along the way. You know that running `ruby prog.rb 5` should output 15. You can also run `make test`. What are the first 7 chars of the hash of the commit (the abbreviated hash) that introduced the bug?"
 
 setup do
   init_from_level
   repo.init
+  system "git branch -m master"
 end
 
 solution do

levels/blame.rb

@@ -1,8 +1,9 @@
 difficulty 2
-description "Someone has put a password inside the file `config.rb` find out who it was."
+description "Identify who put a password inside the file `config.rb`."
 
 setup do
   init_from_level
+  system "git branch -m master"
 end
 
 solution do

levels/branch.rb

@@ -1,11 +1,12 @@
 difficulty 1
-description "You want to work on a piece of code that has the potential to break things, create the branch test_code."
+description "To work on a piece of code that has the potential to break things, create the branch test_code."
 
 setup do
   repo.init
   FileUtils.touch("README")
   repo.add "README"
   repo.commit_all("Initial commit")
+  system "git branch -m master"
 end
 
 solution do

levels/branch_at.rb

@@ -12,6 +12,7 @@
   File.open("file1", 'a') { |f| f.write("\nAdding some more text") }
   repo.add("file1")
   repo.commit_all("Updating file1 again")
+  system "git branch -m master"
 end
 
 solution do

levels/checkout.rb

@@ -6,6 +6,7 @@
   FileUtils.touch("README")
   repo.add("README")
   repo.commit_all("initial commit")
+  system "git branch -m master"
 end
 
 solution do

levels/checkout_file.rb

@@ -14,6 +14,7 @@
   File.open("config.rb", "a") do |file|
     file.puts("These are changed you don't want to keep!")
   end
+  system "git branch -m master"
 end
 
 solution do

levels/checkout_tag.rb

@@ -26,6 +26,8 @@
   repo.add("app.rb")
   repo.commit_all("Changes galore")
   repo.git.tag( { 'f' => true }, "v1.5" )
+
+  system "git branch -m master"
 end
 
 solution do

levels/checkout_tag_over_branch.rb

@@ -7,6 +7,7 @@
   FileUtils.touch("app.rb")
   repo.add("app.rb")
   repo.commit_all("Initial commit")
+  system "git branch -m master"
 
   `echo "Some code" >> app.rb`
   repo.add("app.rb")

levels/cherry-pick.rb

@@ -2,8 +2,9 @@
 description "Your new feature isn't worth the time and you're going to delete it. But it has one commit that fills in `README` file, and you want this commit to be on the master as well."
 
 setup do
-    init_from_level
-    `git stash` # fix for README.md being in githug root an the level
+  init_from_level
+  `git stash` # fix for README.md being in githug root an the level
+  system "git branch -m master"
 end
 
 solution do

levels/clone_to_folder.rb

@@ -1,5 +1,5 @@
 difficulty 1
-description "Clone the repository at https://github.com/Gazler/cloneme to `my_cloned_repo`."
+description "Clone the repository at https://github.com/Gazler/cloneme into the folder `my_cloned_repo`."
 
 solution do
   repo("my_cloned_repo").commit("157b2b61f29ab9df45f31c7cd9cb5d8ff06ecde4")

levels/commit.rb

@@ -3,6 +3,7 @@
 
 setup do
   repo.init
+  system "git branch -m master"
   FileUtils.touch("README")
   repo.add("README")
 end

levels/commit_amend.rb

@@ -7,6 +7,7 @@
   repo.add("README")
   repo.commit_all("Initial commit")
   FileUtils.touch("forgotten_file.rb")
+  system "git branch -m master"
 end
 
 solution do

levels/commit_in_future.rb

@@ -8,6 +8,7 @@
 
   FileUtils.touch("README")
   repo.add("README")
+  system "git branch -m master"
 end
 
 solution do

levels/config.rb

@@ -1,5 +1,5 @@
 difficulty 1
-description "Set up your git name and email, this is important so that your commits can be identified."
+description "Set up your git name and email; this is important so that your commits can be identified."
 
 setup do
   repo.init

levels/conflict.rb

@@ -3,6 +3,7 @@
 
 setup do
   init_from_level
+  system "git branch -m master"
 end
 
 solution do

levels/delete_branch.rb

@@ -3,7 +3,8 @@
 description "You have created too many branches for your project. There is an old branch in your repo called 'delete_me', you should delete it."
 
 setup do
-    init_from_level
+  init_from_level
+  system "git branch -m master"
 end
 
 solution do
@@ -12,4 +13,4 @@
 
 hint do
   puts "Running 'git --help branch' will give you a list of branch commands."
-end
+end

levels/diff.rb

@@ -1,8 +1,9 @@
 difficulty 2
-description "There have been modifications to the `app.rb` file since your last commit. Find out which line has changed."
+description "Since your last commit, file `app.rb` was modified. Find out which line has changed."
 
 setup do
   init_from_level
+  system "git branch -m master"
 end
 
 solution do

levels/fetch.rb

@@ -9,6 +9,7 @@
 
   # local repo
   repo.init
+  system "git branch -m master"
 
   # adds a file to origin/master
   FileUtils.touch "master_file"
@@ -51,16 +52,16 @@
   # after a git fetch command, each branch will be stored in in the .git/FETCH_HEAD file. Each branch is on its own line
   # This command will count the number of lines, which will give the number of branches
   if File.file?('.git/FETCH_HEAD') # checks for file existence
-  	num_remote = File.read(".git/FETCH_HEAD").split("\n").count
+    num_remote = File.read(".git/FETCH_HEAD").split("\n").count
   else
-  	num_remote = 0
+    num_remote = 0
   end
 
   # there should be 1 local branch and 2 remote branches for a success condition
   if local_branches == 1 and num_remote == 2
-  	result = true
+    result = true
   else
-  	result = false
+    result = false
   end
 end
 

levels/find_old_branch.rb

@@ -3,6 +3,7 @@
 
 setup do
   init_from_level
+  system "git branch -m master"
 end
 
 solution do

levels/grep.rb

@@ -3,6 +3,7 @@
 
 setup do
   init_from_level
+  system "git branch -m master"
 end
 
 solution do

levels/ignore.rb

@@ -4,6 +4,7 @@
 setup do
   repo.init
   FileUtils.touch("README.swp")
+  system "git branch -m master"
   file = File.open(".git/config", "w") do |file|
     file.puts "[core]\nexcludesfile="
   end

levels/include.rb

@@ -6,6 +6,7 @@
   FileUtils.touch("first.a")
   FileUtils.touch("second.a")
   FileUtils.touch("lib.a")
+  system "git branch -m master"
   file = File.open(".git/config", "w") do |file|
     file.puts "[core]\nexcludesfile="
   end

levels/log.rb

@@ -1,12 +1,13 @@
 difficulty 2
 
-description "Find out what the hash of the latest commit is."
+description "Identify the hash of the latest commit."
 
 setup do
   repo.init
   file = File.new("newfile.rb", "w")
   repo.add("newfile.rb")
   repo.commit_all("THIS IS THE COMMIT YOU ARE LOOKING FOR!")
+  system "git branch -m master"
 end
 
 solution do

levels/merge.rb

@@ -1,12 +1,13 @@
 difficulty 2
-description "We have a file in the branch 'feature'; Let's merge it to the master branch."
+description "We have a file in the branch 'feature'. Let's merge it with the master branch."
 
 setup do
-	init_from_level
+  init_from_level
+  system "git branch -m master"
 end
 
 solution do
-	File.exists?("file1")	&& File.exists?("file2")
+  File.exists?("file1")	&& File.exists?("file2")
 end
 
 hint do

levels/merge_squash.rb

@@ -7,6 +7,7 @@
   FileUtils.touch "file1"
   repo.add        "file1"
   repo.commit_all "First commit"
+  system "git branch -m master"
 
   repo.git.native :checkout, {"b" => true}, 'long-feature-branch'
   File.open("file3", 'w') { |f| f << "some feature\n" }

levels/number_of_files_committed.rb

@@ -1,5 +1,5 @@
 difficulty 1
-description "There are some files in this repository, how many of the files are staged for a commit?"
+description "There are some files in this repository; how many of them are staged for a commit?"
 
 setup do
   repo.init
@@ -8,6 +8,7 @@
   %w{rubyfile4.rb rubyfile5.rb}.each do |file|
     FileUtils.touch(file)
     repo.add(file)
+    system "git branch -m master"
   end
   repo.commit_all "Commit"
 
@@ -47,5 +48,5 @@
 end
 
 hint do
-  puts "You are looking for a command to identify the status of the repository, (resembles a linux command)."
+  puts "You are looking for a command to identify the status of the repository (resembles a Linux command)."
 end

levels/pull.rb

@@ -5,6 +5,7 @@
 setup do
   repo.init
   repo.remote_add("origin", "https://github.com/pull-this/thing-to-pull")
+  system "git branch -m master"
 end
 
 solution do

levels/push.rb

@@ -28,6 +28,7 @@
   FileUtils.touch "file3"
   repo.add        "file3"
   repo.commit_all "Third commit"
+  system "git branch -m master"
 
   # remote repo
   Dir.chdir tmpdir
@@ -39,6 +40,7 @@
   FileUtils.touch "file4"
   repo.add        "file4"
   repo.commit_all "Fourth commit"
+  system "git branch -m master"  # tentative addition
 
   # change back to original repo to set up a remote
   Dir.chdir cwd

levels/push_branch.rb

@@ -14,6 +14,7 @@
   FileUtils.touch "file1"
   repo.add        "file1"
   repo.commit_all "committed changes on master"
+  system "git branch -m master"
 
   # copy the repo to remote
   FileUtils.cp_r ".", tmpdir

levels/push_tags.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "There are tags in the repository that aren't pushed into remote repository. Push them now."
+description "A tag in the local repository isn't pushed into remote repository. Push it now."
 
 setup do
   # remember the working directory so we can come back to it later
@@ -14,6 +14,7 @@
   repo.add        "file1"
   repo.commit_all "First commit"
   repo.git.tag({'f' => true}, "tag_to_be_pushed")
+  system "git branch -m master"
 
   FileUtils.touch "file2"
   repo.add        "file2"

levels/rebase.rb

@@ -4,6 +4,7 @@
 
 setup do
   init_from_level
+  system "git branch -m master"
 end
 
 solution do

levels/rebase_onto.rb

@@ -13,6 +13,7 @@
   File.open(authors_file, "w") { |f| f << "https://github.com/janis-vitols\n" }
   repo.add(authors_file)
   repo.commit_all("Create authors file")
+  system "git branch -m master"
 
   repo.git.native :checkout, { "b" => true }, "wrong_branch"
   File.open(authors_file, "w") { |f| f << "None\n" }

levels/remote.rb

@@ -5,6 +5,7 @@
 setup do
   repo.init
   repo.remote_add("my_remote_repo", "https://github.com/Gazler/githug")
+  system "git branch -m master"
 end
 
 solution do

levels/remote_add.rb

@@ -4,6 +4,7 @@
 
 setup do
   repo.init
+  system "git branch -m master"
 end
 
 solution do

levels/remote_url.rb

@@ -6,6 +6,7 @@
   repo.init
   repo.remote_add("my_remote_repo", "https://github.com/Gazler/githug")
   repo.remote_add("remote_location", "https://github.com/githug/not_a_repo")
+  system "git branch -m master"
 end
 
 solution do

levels/rename.rb

@@ -7,6 +7,7 @@
   FileUtils.touch("oldfile.txt")
   repo.add("oldfile.txt")
   repo.commit_all("Commited oldfile.txt")
+  system "git branch -m master"
 end
 
 solution do