gitc commit --no-add option, doing a straight commit if merge commit

winton · Oct 3, 2012 · 2d086ee · 2d086ee
1 parent 7e933ef
commit 2d086ee
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/lib/gitcycle.rb b/lib/gitcycle.rb
@@ -187,6 +187,7 @@ def checkout(*args)
 
   def commit(*args)
     msg = nil
+    no_add = args.delete("--no-add")
 
     if args.empty?
       require_git && require_config
@@ -205,13 +206,19 @@ def commit(*args)
       end
     end
 
-    cmd = "git add . && git add . -u && git commit -a"
+    if no_add
+      cmd = "git commit"
+    else
+      cmd = "git add . && git add . -u && git commit -a"
+    end
 
-    if msg
+    if File.exists?("#{Dir.pwd}/.git/MERGE_HEAD")
-      run(cmd + "m #{msg.dump}")
+      Kernel.exec(cmd)
+    elsif msg
+      run(cmd + " -m #{msg.dump}")
       Kernel.exec("git commit --amend")
     elsif args.empty?
-      run(cmd)
+      Kernel.exec(cmd)
     else
       exec_git(:commit, args)
     end