Merge pull request github#181 from github/improve-boom-message

rick · rick · commit eb1f8c162cea · 2012-12-08T13:31:42.000-08:00
Make a more useful commit message when publishing
diff --git a/Rakefile b/Rakefile
@@ -5,8 +5,23 @@ task :compile do
   `nanoc compile`
 end
 
+# prompt user for a commit message; default: HEAD commit 1-liner
+def commit_message
+  last_commit = `git log -1 --pretty=format:"%s"`.chomp.strip
+  last_commit = 'Publishing developer content to GitHub pages.' if last_commit == ''
+
+  print "Enter a commit message (default: '#{last_commit}'): "
+  STDOUT.flush
+  mesg = STDIN.gets.chomp.strip
+
+  mesg = last_commit if mesg == ''
+  mesg.gsub(/'/, '') # to allow this to be handed off via -m '#{message}'
+end
+
 desc "Publish to http://developer.github.com"
 task :publish => [:clean] do
+  mesg = commit_message
+
   FileUtils.rm_r('output') if File.exist?('output')
 
   sh "nanoc compile"
@@ -21,9 +36,9 @@ task :publish => [:clean] do
     tsha = `git write-tree`.strip
     puts "Created tree   #{tsha}"
     if old_sha.size == 40
-      csha = `echo 'boom' | git commit-tree #{tsha} -p #{old_sha}`.strip
+      csha = `git commit-tree #{tsha} -p #{old_sha} -m '#{mesg}'`.strip
     else
-      csha = `echo 'boom' | git commit-tree #{tsha}`.strip
+      csha = `git commit-tree #{tsha} -m '#{mesg}'`.strip
     end
     puts "Created commit #{csha}"
     puts `git show #{csha} --stat`
diff --git a/content/changes/2012-12-08-finding-source-and-fork-repos-for-organizations.html b/content/changes/2012-12-08-finding-source-and-fork-repos-for-organizations.html
@@ -20,3 +20,4 @@
 Check out the docs for sorting and filtering options:
 
 * [Organization Repositories](/v3/repos/#list-organization-repositories)
+

Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,4 @@`
`20`	`20`	`Check out the docs for sorting and filtering options:`
`21`	`21`
`22`	`22`	`* [Organization Repositories](/v3/repos/#list-organization-repositories)`
	`23`	`+`