0
@@ -1,18 +1,31 @@
0
 module GitRemoteBranch
0
   def read_params(argv)
0
+    #TODO Some validation on the params
0
+
0
     p={}
0
     p[:explain]        = explain_mode!(argv)
0
     p[:action]         = get_action(argv[0]) || :help
0
+
0
+    return p if p[:action] == :help
0
+
0
     p[:branch]         = get_branch(argv[1])
0
     p[:origin]         = get_origin(argv[2])
0
-    p[:current_branch] = get_current_branch
0
 
0
-    #If in explain mode, the user doesn't have to specify a branch to get the explanation
0
-    p[:branch] ||= "branch_to_#{p[:action]}" if p[:explain]
0
+    # If in explain mode, the user doesn't have to specify a branch or be on in
0
+    # actual repo to get the explanation. 
0
+    # Of course if he is, the explanation can be made better.
0
+    if p[:explain]
0
+      p[:branch] ||= "branch_to_#{p[:action]}"
0
+      p[:current_branch] = begin
0
+        get_current_branch
0
+      rescue 
0
+        'current_branch'
0
+      end
0
 
0
-    #TODO Some validation on the params
0
-
0
-    p
0
+    else
0
+      p[:current_branch] = get_current_branch
0
+    end
0
+    return p
0
   end
0
 
0
   def explain_mode!(argv)