Merge branch 'master' of github.com:jlord/git-it

dfan · May 31, 2015 · bf7c00a · bf7c00a
2 parents 8868723 + a083a75
commit bf7c00a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/problems/branches_arent_just_for_birds/verify.js b/problems/branches_arent_just_for_birds/verify.js
@@ -10,7 +10,7 @@ var username = ""
 // verify they've pushed
 // check the file is in contributors directory
 
-exec('git config user.username', function(err, stdout, stdrr) {
+exec('git config user.username', function(err, stdout, stderr) {
   if (err) return console.log(err)
   username = stdout.trim()
 

diff --git a/problems/merge_tada/verify.js b/problems/merge_tada/verify.js
@@ -17,9 +17,10 @@ exec('git reflog -10', function(err, stdout, stdrr) {
 
     exec('git branch', function(err, stdout, stdrr) {
       branches = stdout.trim()
-
-      if (branches.match(user)) console.log("Uh oh, branch is still there.")
+      branchName = "add-"+user
+
+      if (branches.match(branchName)) console.log("Uh oh, branch is still there.")
       else return console.log("Branch deleted!")
     })
   })
-})
+})