lib/commands/commit.rb in dev-2.0.134 vs lib/commands/commit.rb in dev-2.0.135

@@ -1,35 +1,40 @@
 #require_relative('internet.rb')
 
 class Commit < Array
 	def update
+		message=""
+		message=IO.read('commit.message').strip if File.exists?('commit.message')
+
 		if(File.exists?('.git') && `git config --list`.include?('user.name='))
 			if(!`git status`.include?('nothing to commit') &&
 			   !`git status`.include?('untracked files present'))
-			  if(File.exists?('commit.message') && File.read('commit.message').gsub(/\s+/,"").length >0)
-			  	add "git commit -a -v -m \"#{File.read('commit.message')}\""
+			  if(message.length==0)#File.exists?('commit.message') && File.read('commit.message').gsub(/\s+/,"").length >0)
+				if(defined?(REQUIRE_COMMIT_MESSAGE))
+					Commit.reset_commit_message
+					raise "commit.message required to perform commit"
+				else
+			  		add "git commit -m'all'"
+			  	end
 			  else
-			    add "git commit -m'all'"
+			    #add "git commit -a -v -m \"#{File.read('commit.message')}\""
+			    add "git commit -a -v --file commit.message"
+			    add "<%Commit.reset_commit_message%>"
 			  end
-			  #add "<%FileUtils.rm('commit.message')%>" if File.exists?('commit.message')
-			  add "<%File.open('commit.message','w'){|f|f.write('')}%>"
+			 # add "<%File.open('commit.message','w'){|f|f.write('')}%>"
 		    end 		
 		end
 		if(File.exists?('.svn'))
-			message=""
-			message=IO.read('commit.message').strip if File.exists?('commit.message')
-			if(!File.exists?('commit.message') || message.length==0)
+			if(message.length==0)
 				if(defined?(REQUIRE_COMMIT_MESSAGE))
-					puts "commit.message required to perform commit"
 					Commit.reset_commit_message
 					raise "commit.message required to perform commit"
 				else
 					add 'svn commit -m"commit all"'
 				end
 			else
 				add 'svn commit --file commit.message'
 				add "<%Commit.reset_commit_message%>"
-				#add "<%FileUtils.rm('commit.message')%>" if File.exists?('commit.message')
 			end
 		end
 	end
 
 	def self.reset_commit_message
\ No newline at end of file