aliens/tekuti
1
0
Fork 0
Code Activity

fix various (tekuti git) errors

Browse source 
* tekuti/git.scm (git-update-ref, patch-blob, munge-tree1-recursive):
  Fix various errors caught by the compiler.
This commit is contained in:
Andy Wingo 2010-11-13 18:40:05 +01:00
parent f34e3b1c78
commit 31a2d6ebbc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tekuti/git.scm
View file

@ -196,7 +196,7 @@
commit) commit)
(else (else
(pk "failed to update the ref, trying again..." refname) (pk "failed to update the ref, trying again..." refname)
(git-update-ref (git-rev-parse refname) (1- count)))))) (git-update-ref refname proc (1- count))))))
(define (git-commit-tree tree parent message timestamp) (define (git-commit-tree tree parent message timestamp)
(string-trim-both (string-trim-both
@ -221,8 +221,9 @@
(run '() patch (list "patch" "-N" "-s" "-u" "-r" "/dev/null" orig)) (run '() patch (list "patch" "-N" "-s" "-u" "-r" "/dev/null" orig))
(with-output-to-blob (with-output-to-blob
(display (display
(call-with-input-file (orig) (call-with-input-file orig
(read-delimited "" port))))))) (lambda (port)
(read-delimited "" port))))))))
;; could leave stray comments if the post directory changes. but this is ;; could leave stray comments if the post directory changes. but this is
;; probably the best that we can do, given that git does not track ;; probably the best that we can do, given that git does not track
@ -280,7 +281,7 @@
(define (munge-tree1-recursive dents command ldir rdir arg) (define (munge-tree1-recursive dents command ldir rdir arg)
(define (command-error why) (define (command-error why)
(error "munge-tree1-recursive error" why command dir arg)) (error "munge-tree1-recursive error" why command ldir rdir arg))
(let ((dent (assoc ldir dents))) (let ((dent (assoc ldir dents)))
(if (and dent (not (eq? (caddr dent) 'tree))) (if (and dent (not (eq? (caddr dent) 'tree)))
(command-error 'not-a-tree)) (command-error 'not-a-tree))