Merge branch 'master' into verify-case-early

problems/branches_arent_just_for_birds/solution.js

@@ -1,2 +1,2 @@
-console.log("Found the branch as expected!")
-console.log("Changes have been pushed!")
+console.log("Found branch as expected!")
+console.log("Changes have been pushed!")

problems/branches_arent_just_for_birds/verify.js

@@ -3,24 +3,28 @@
 var exec = require('child_process').exec
 
 // get their username
-// verify branch matches username
+// verify branch matches username, case too.
 // verify they've pushed
 
 exec('git config user.username', function(err, stdout, stdrr) {
-  var username = stdout.trim().toLowerCase()
-
-  exec('git status', function(err, stdout, stderr) {
-    var branch = stdout.trim().toLowerCase()
-    var branchName = "add-" + username
-    exec('git reflog show origin/' + branchName, function(err, stdout, stderr) {
-
-      var ref = stdout.trim()
-      if (branch.match(branchName)) console.log("Found the branch as expected!")
-      else console.log("branch name was not:\n'" + branchName + "'")
-
-      if (ref.match("update by push")) console.log("Changes have been pushed!")
-      else console.log("Changes not pushed")
-
-    })
+  var username = stdout.trim()
+
+  exec('git rev-parse --abbrev-ref HEAD', function(err, stdout, stderr) {
+    var actualBranch = stdout.trim()
+    var expectedBranch = "add-" + username
+    if (actualBranch.match(expectedBranch)) {
+      return console.log("Found branch as expected!")
+      checkPush(actualBranch)
+    } else {
+      console.log("Branch name expected: " + expectedBranch)
+      checkPush(actualBranch)
+    }
   })
 })
+
+function checkPush(branchname) {
+  exec('git reflog show origin/' + branchname, function(err, stdout, stderr) {
+    if (stdout.match("update by push")) console.log("Changes have been pushed!")
+    else console.log("Changes not pushed")
+  })
+}