[elpa] master 28d5496 11/63: Use git describe for doc HTML output

[Noam Postavsky]

branch: master
commit 28d5496144cc1804a41df3a979802003513678d3
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>

    Use git describe for doc HTML output
    
    * Rakefile (:doc:upload):
    * doc/yas-doc-helper.el: Use 'git describe' output instead of 'git
    rev-parse', since it's more readable.
---
 Rakefile              | 6 +-----
 doc/yas-doc-helper.el | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Rakefile b/Rakefile
index 48a2086..e2bb4f7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -76,16 +76,12 @@ namespace :doc do
       Dir.glob("doc/stylesheets/*.css").each do |file|
         FileUtils.cp file, 'doc/gh-pages/stylesheets'
       end
-      curRev = `git rev-parse --verify HEAD`.chomp()
+      curRev = `git describe`.chomp()
       expRev = IO.read('doc/html-revision').chomp()
       if curRev != expRev
         raise ("The HTML rev: #{expRev},\n" +
                "current  rev: #{curRev}!\n")
       end
-      if !system "git diff-index --quiet HEAD"
-        system "git status --untracked-files=no"
-        raise "You have uncommitted changes!"
-      end
       Dir.chdir 'doc/gh-pages' do
         sh "git commit -a -m 'Automatic documentation update.\n\n" +
           "From #{curRev.chomp()}'"
diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el
index 623ea9f..e272e41 100644
--- a/doc/yas-doc-helper.el
+++ b/doc/yas-doc-helper.el
@@ -125,12 +125,12 @@
        ;; build, don't depend on git.
        (rev (unless src-epoch
               (ignore-errors
-                (car (process-lines "git" "rev-parse" "--verify" "HEAD")))))
+                (car (process-lines "git" "describe" "--dirty")))))
        (date (format-time-string
               "(%Y-%m-%d %H:%M:%S)"
               (seconds-to-time
                (string-to-number
-                (or (if rev (car (process-lines "git" "show" "--format=%ct" 
rev))
+                (or (if rev (car (process-lines "git" "show" "--format=%ct"))
                       src-epoch)
                     "0")))
               t))