[cmucl-cvs] [git] CMU Common Lisp branch master updated. 1e5b21e28d58b1b16a36111967e2ee77464cafbd

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  1e5b21e28d58b1b16a36111967e2ee77464cafbd (commit)
      from  fce6baff8422e8de9c3f4b33e557c55e3e34ebee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1e5b21e28d58b1b16a36111967e2ee77464cafbd
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Mon Oct 10 21:54:17 2011 -0700

    Handle the case where Git describe prints nothing.  In this case, just
    use the original file comment.

diff --git a/compiler/main.lisp b/compiler/main.lisp
index 7bfce70..58af043 100644
--- a/compiler/main.lisp
+++ b/compiler/main.lisp
@@ -1127,11 +1127,13 @@ in the user USER-INFO slot of STREAM-SOURCE-LOCATIONs.")
 	       (setf (default-directory) cwd))))
 	 (generate-comment (file-info)
 	   (let* ((name (pathname (source-info-stream file-info)))
-		  (proc (run-git name)))
-	     (if (and proc (zerop (process-exit-code proc)))
+		  (proc (run-git name))
+		  comment)
+	     (if (and proc (zerop (process-exit-code proc))
+		      (setf comment (read-line (process-output proc) nil nil)))
 		 (format nil "$Header: ~A ~A $"
 			 (enough-namestring name)
-			 (read-line (process-output proc)))
+			 comment)
 		 (second form)))))
       (cond ((file-info-comment file)
 	     (compiler-warning _N"Ignoring extra file comment:~%  ~S." form))

-----------------------------------------------------------------------

Summary of changes:
 compiler/main.lisp |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp